Fix null pointer exception which made gtetrinet crash on connect. Patch from Ian...

diff --git a/ChangeLog b/ChangeLog
index f7d6cd67c285c693f24b7e3a54aac5693520617e..21a80885b18c853e3e29c43c43987ffb82b36b57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-08  Jordi Mallach  <jordi@sindominio.net>
+
+       * NEWS: updated.
+       * src/dialogs.c (connectingdialog_timeout): apply patch from
+       Ian Zink <zforce@networkusa.net>, fixes a null pointer exception
+       which caused a segfault on connect for  many people. Thanks!
+
 2003-01-08  Dani Carbonell  <bocata@panete.net>
 
        * TODO: remove composed characters problem.

diff --git a/NEWS b/NEWS
index 0403da330c30018145c06d76d623ed9a2fd30b72..22d47f7b7d6f7e9b7a78ad0bb12dc27d89639334 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
 GTetrinet 0.5.2 - Unreleased
+- Fixed segfault on connect dialog many people were seeing. Really.
 - Fix behaviour of "Ok" button in preferences. It actually works now.
 - Added intltool support.
 - Dialogs look nicer now, and are HIG compliant.
 - Added sanity checks in the connect dialog, in case you include invalid
   or no nickname, server name or spectator password.
 - Ignore the shift status, so you can use shift keys as game keys.
+- Rewrote fields message input field, so it deals with composed characters.
 - Code cleanups.
 
 GTetrinet 0.5.1 - 2003-01-06

diff --git a/src/dialogs.c b/src/dialogs.c
index 1cbfba83a314c3a2e3661eda2dd8e41245cafb43..81fc867449f959ba35da84ce145710ecc1623e26 100644 (file)
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -69,9 +69,10 @@ gint connectingdialog_timeout (void)
 {
     GtkAdjustment *adj;
     adj = GTK_PROGRESS(progressbar)->adjustment;
-    gtk_progress_set_value (GTK_PROGRESS(progressbar),
-                            (adj->value+1)>adj->upper ?
-                            adj->lower : adj->value+1);
+    if (adj != NULL)
+      gtk_progress_set_value (GTK_PROGRESS(progressbar),
+                              (adj->value+1)>adj->upper ?
+                              adj->lower : adj->value+1);
     return TRUE;
 }