ref: 0a5d13bcd5e6a88418abaf528d9d529ced7dfb9c
parent: d9e03f50daffc37027a5c57c88c7fd4241a58782
author: Simon Tatham <anakin@pobox.com>
date: Sat Nov 24 19:46:48 EST 2018
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.
--- a/gtk.c
+++ b/gtk.c
@@ -2575,9 +2575,8 @@
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;
@@ -2789,6 +2788,8 @@
#endif /* STYLUS_BASED */
changed_preset(fe);
+
+ snaffle_colours(fe);
if (midend_wants_statusbar(fe->me)) {GtkWidget *viewport;