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 7e117b0df355c7b2db53d7fbda35a139932ff9e2..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>
@@ -53,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);
 }