From: Simon Tatham <anakin@pobox.com>
Date: Sun, 25 Nov 2018 00:46:48 +0000 (+0000)
Subject: Fix GTK 2 crash introduced by previous commit.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=0a5d13bcd5e6a88418abaf528d9d529ced7dfb9c;p=sgt-puzzles.git

Fix GTK 2 crash introduced by previous commit.

Moving the snaffle_colours() call earlier is fine in GTK 3, where the
potential call to frontend_default_colour doesn't depend on the window
already having been created. But it falls over in GTK 2 where it does.

Moved the non-headless-mode version of that call back to where it was
before the --screenshot change.
---

diff --git a/gtk.c b/gtk.c
index c0bcb95..d41f867 100644
--- a/gtk.c
+++ b/gtk.c
@@ -2575,9 +2575,8 @@ static frontend *new_window(
 	midend_new_game(fe->me);
     }
 
-    snaffle_colours(fe);
-
     if (headless) {
+        snaffle_colours(fe);
         get_size(fe, &fe->pw, &fe->ph);
         setup_backing_store(fe);
         return fe;
@@ -2790,6 +2789,8 @@ static frontend *new_window(
 
     changed_preset(fe);
 
+    snaffle_colours(fe);
+
     if (midend_wants_statusbar(fe->me)) {
 	GtkWidget *viewport;
 	GtkRequisition req;