cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 16:05:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #728 from tdewey-rpi/release/1.8.3

Browse source 
meta: v1.8.3
This commit is contained in:
maxnet 2023-11-16 19:41:43 +01:00 • committed by GitHub
commit bee8d3671a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
debian/changelog vendored
View file

@ -1,3 +1,10 @@
rpi-imager (1.8.3) unstable; urgency=medium
* Home: Fixed "No filtering" option
* OS customisation: Fixed no-customisation flow
-- Floris Bos <bos@je-eigen-domein.nl> Thu, 16 Nov 2023 14:00:00 +0200
rpi-imager (1.8.2) unstable; urgency=medium rpi-imager (1.8.2) unstable; urgency=medium
* Home: Device filtering reworked to download OS list eagerly * Home: Device filtering reworked to download OS list eagerly
@ -11,7 +18,7 @@ rpi-imager (1.8.2) unstable; urgency=medium
* OS customisation: Allow empty PSK for 'Open' WiFi networks. * OS customisation: Allow empty PSK for 'Open' WiFi networks.
* OS List: Use ImageList v4 URL * OS List: Use ImageList v4 URL
-- Floris Bos <bos@je-eigen-domein.nl> Thu, 15 Nov 2023 20:16:16 +0200 -- Floris Bos <bos@je-eigen-domein.nl> Wed, 15 Nov 2023 20:16:16 +0200
rpi-imager (1.8.1) unstable; urgency=medium rpi-imager (1.8.1) unstable; urgency=medium

4
src/CMakeLists.txt
View file

@ -8,8 +8,8 @@ OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
project(rpi-imager LANGUAGES CXX C) project(rpi-imager LANGUAGES CXX C)
set(IMAGER_VERSION_MAJOR 1) set(IMAGER_VERSION_MAJOR 1)
set(IMAGER_VERSION_MINOR 8) set(IMAGER_VERSION_MINOR 8)
set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.2") set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.3")
set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},2,0") set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},3,0")
add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}") add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV}) add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV})
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)

1
src/main.qml
View file

@ -1191,6 +1191,7 @@ ApplicationWindow {
confirmwritepopup.askForConfirmation() confirmwritepopup.askForConfirmation()
} }
onNo: { onNo: {
imageWriter.setImageCustomization("", "", "", "", "")
confirmwritepopup.askForConfirmation() confirmwritepopup.askForConfirmation()
} }
onNoClearSettings: { onNoClearSettings: {