diff -u gparted-0.3.3/debian/changelog gparted-0.3.3/debian/changelog --- gparted-0.3.3/debian/changelog +++ gparted-0.3.3/debian/changelog @@ -1,3 +1,11 @@ +gparted (0.3.3-2ubuntu6.1) gutsy-proposed; urgency=low + + * Add debian/patches/04_Win_GParted.cc.diff from version 0.3.3-6: + - Fix crashes when refreshing devices (LP: #141516) + - Patch by Denis Sirotkin + + -- dAniel hAhler Mon, 19 Nov 2007 20:32:25 +0100 + gparted (0.3.3-2ubuntu6) gutsy; urgency=low * Add debian/patches/02_fdi_robustification.patch: only in patch2: unchanged: --- gparted-0.3.3.orig/debian/patches/04_Win_GParted.cc.diff +++ gparted-0.3.3/debian/patches/04_Win_GParted.cc.diff @@ -0,0 +1,19 @@ +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=446522 + +diff -ur gparted-0.3.3.orig/src/Win_GParted.cc gparted-0.3.3/src/Win_GParted.cc +--- gparted-0.3.3.orig/src/Win_GParted.cc 2006-12-01 18:14:23.000000000 +0500 ++++ gparted-0.3.3/src/Win_GParted.cc 2007-11-04 11:46:32.000000000 +0500 +@@ -916,8 +916,13 @@ + + void Win_GParted::combo_devices_changed() + { ++ unsigned int old_current_device = current_device; + //set new current device + current_device = combo_devices .get_active_row_number() ; ++ if ( current_device == (unsigned int) -1 ) ++ current_device = old_current_device; ++ if ( current_device >= devices .size() ) ++ current_device = 0 ; + set_title( String::ucompose( _("%1 - GParted"), devices[ current_device ] .get_path() ) ); + + //refresh label_device_info