summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-24 10:25:26 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-24 10:25:26 +0000
commit74e908552333ce8d7ba840c80d85627a031e2716 (patch)
tree80c0c873d6839b353df430de6cfdaa6421dc6e31
parent623ebaf238e24fb482ab0b4dc423d98ce95acb79 (diff)
downloaddrakx-74e908552333ce8d7ba840c80d85627a031e2716.tar
drakx-74e908552333ce8d7ba840c80d85627a031e2716.tar.gz
drakx-74e908552333ce8d7ba840c80d85627a031e2716.tar.bz2
drakx-74e908552333ce8d7ba840c80d85627a031e2716.tar.xz
drakx-74e908552333ce8d7ba840c80d85627a031e2716.zip
fix race on ugtk2->exit that causes a crash (#33894)
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/drakclock3
2 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 22ab4de7b..2f9f945a8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakclock:
+ o fix race on ugtk2->exit that causes a crash (#33894)
+
Version 10.4.209 - 22 September 2007, by Olivier "blino" Blin
- make formatXiB() handle negative numbers (for rpmdrake)
diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
index 805e13d9b..e34980807 100755
--- a/perl-install/standalone/drakclock
+++ b/perl-install/standalone/drakclock
@@ -327,6 +327,9 @@ sub Repaint {
my $dRadians_hour_real = $dRadians_hour + $dRadians_min / 12;
my $dRadians_min_real = POSIX::floor($dRadians_min / $PI * 30) * $PI / 30;
my $dRadians_sec_real = $dRadians_sec;
+ my $gc = $drawing_area->style->white_gc;
+ # fix race on ugtk2->exit that causes a crash (#33894)
+ return 0 if !$gc;
$pixmap->draw_rectangle($drawing_area->style->white_gc, 1, 0, 0, $width, $height);
my ($midx, $midy) = ($width / 2, $height / 2);
$radius = ($midx < $midy ? $midx : $midy) - 10;