diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rwxr-xr-x | control-center | 9 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,6 @@ +- delay starting up logdrake, thus fixing segfault on startup when "Display + Logs" option is set (mga#10289) + Version 12.48 - 28 January 2014 Donald Stewart - Add new artwork for MGA4 diff --git a/control-center b/control-center index 8bcb7aaf..f72431d8 100755 --- a/control-center +++ b/control-center @@ -39,6 +39,7 @@ use Gtk2::WebKit; use MDV::Control_Center; +my $during_startup = 1; my (%tool_pids, %tool_feedback, $gurpmi_pid); @@ -633,7 +634,11 @@ my @menu_items = ( sub { $option_values{show_log} = $check_boxes{show_log}->get_active; if ($option_values{show_log}) { - start_logdrake(); + if ($during_startup) { + Glib::Timeout->add_seconds(1, \&start_logdrake); + } else { + start_logdrake(); + } } else { kill_logdrake(); } @@ -705,7 +710,6 @@ $view->signal_connect('load-finished' => sub { state $done; return if $done; $done = 1; - Glib::Timeout->add(100, sub { sig_child('CHLD', 1); 1 }); load_program() if $program; }); # so that it exists when building steps: @@ -1100,6 +1104,7 @@ $SIG{TERM} = \&quit_global; $window_splash->destroy; undef $window_splash; +$during_startup = 0; Gtk2->main; sub load_program() { |