From 29ec8552826f64bfa8cad01a433306886328c522 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 17 Oct 2014 11:22:14 +0200 Subject: Fix GUI crash when running in thread mode and init wasn't done when show was called. --- plugingui/plugingui.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'plugingui/plugingui.cc') diff --git a/plugingui/plugingui.cc b/plugingui/plugingui.cc index f345660..5408334 100644 --- a/plugingui/plugingui.cc +++ b/plugingui/plugingui.cc @@ -171,6 +171,8 @@ void closeClick(void *ptr) PluginGUI::PluginGUI() : MessageReceiver(MSGRCV_UI), sem("plugingui") { + initialised = false; + windowClosedHandler = NULL; changeMidimapHandler = NULL; @@ -464,10 +466,14 @@ void PluginGUI::init() window->show(); sem.post(); + + initialised = true; } void PluginGUI::show() { + while(!initialised) usleep(10000); + if(!window) init(); window->show(); @@ -475,11 +481,15 @@ void PluginGUI::show() void PluginGUI::hide() { + while(!initialised) usleep(10000); + if(window) window->hide(); } void PluginGUI::processEvents() { + if(!initialised) return; + if(closing) { if(windowClosedHandler) windowClosedHandler(windowClosedPtr); closing = false; -- cgit v1.2.3