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

meta: v1.8.3
raspberrypi · Nov 16, 2023 · bee8d36 · bee8d36
2 parents 9af4f15 + d729317
commit bee8d36
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -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 <[email protected]>  Thu, 16 Nov 2023 14:00:00 +0200
+
 rpi-imager (1.8.2) unstable; urgency=medium
 
   * 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 List: Use ImageList v4 URL
 
- -- Floris Bos <[email protected]>  Thu, 15 Nov 2023 20:16:16 +0200
+ -- Floris Bos <[email protected]>  Wed, 15 Nov 2023 20:16:16 +0200
 
 rpi-imager (1.8.1) unstable; urgency=medium
 

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

diff --git a/src/main.qml b/src/main.qml
@@ -1191,6 +1191,7 @@ ApplicationWindow {
             confirmwritepopup.askForConfirmation()
         }
         onNo: {
+            imageWriter.setImageCustomization("", "", "", "", "")
             confirmwritepopup.askForConfirmation()
         }
         onNoClearSettings: {