# HG changeset patch
# User Torsten <ttl@justmail.de>
# Date 1425282436 -3600
# Node ID b403780efe90c9e62c5be5e585ee86119966a75c
# Parent  75d1c4096ba7a78734dfa3e80ce3dede4246c8bf
make sure shortcuts are active in editor after settings dialog (bug #44397)

* main-window.cc (notice_settings): configure main-window shortcuts
  depending on focus of terminal dock widget, make sure the active
  dock widgets title bar is correctly styled after settings dialog

diff -r 75d1c4096ba7 -r b403780efe90 libgui/src/main-window.cc
--- a/libgui/src/main-window.cc	Sun Mar 01 20:36:34 2015 +0000
+++ b/libgui/src/main-window.cc	Mon Mar 02 08:47:16 2015 +0100
@@ -746,13 +746,14 @@
 
   _prevent_readline_conflicts =
     settings->value ("shortcuts/prevent_readline_conflicts", true).toBool ();
-  configure_shortcuts ();
   set_global_shortcuts (command_window_has_focus ());
 
   _suppress_dbg_location =
         ! settings->value ("terminal/print_debug_location", false).toBool ();
 
   resource_manager::update_network_settings ();
+
+  emit active_dock_changed (0, _active_dock); // update dock widget styles
 }
 
 void