enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / Dialogs.C

diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index 8eead27764696bfe76c260b824effd7fedcd809c..6a228c99da866f99cf83e679ef3df13b62482cfd 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -14,6 +14,8 @@
 
 #include "Dialogs.h"
 
+#include "lyx_cb.h"
+
 #include "controllers/Dialog.h"
 
 #include <boost/signal.hpp>
@@ -44,13 +46,6 @@ private:
 };
 
 
-boost::signal<void()> & Dialogs::redrawGUI()
-{
-       static BugfixSignal<boost::signal<void()> > thesignal;
-       return thesignal();
-}
-
-
 namespace {
 
 BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
@@ -60,7 +55,12 @@ BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
 
 void Dialogs::hide(string const & name, InsetBase* inset)
 {
-       hideSignal()(name, inset);
+       // Don't send the signal if we are quitting, because on MSVC it is
+       // destructed before the cut stack in CutAndPaste.C, and this method
+       // is called from some inset destructor if the cut stack is not empty
+       // on exit.
+       if (!quitting)
+               hideSignal()(name, inset);
 }
 
 
@@ -68,7 +68,7 @@ Dialogs::Dialogs(LyXView & lyxview)
        : lyxview_(lyxview), in_show_(false)
 {
        // Connect signals
-       redrawGUI().connect(boost::bind(&Dialogs::redraw, this));
+       hideSignal().connect(boost::bind(&Dialogs::hideSlot, this, _1, _2));
 }
 
 
@@ -164,7 +164,8 @@ void Dialogs::disconnect(string const & name)
        if (!isValidName(name))
                return;
 
-       open_insets_[name] = 0;
+       if (open_insets_.find(name) != open_insets_.end())
+               open_insets_[name] = 0;
 }