Author: jghali
Date: Tue Mar 12 11:19:38 2019
New Revision: 22888

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22888
Log:
#15597: crash when inserting a glyph... in an image frame

Modified:
    trunk/Scribus/scribus/appmodehelper.cpp

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22888&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp     (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp     Tue Mar 12 11:19:38 2019
@@ -290,9 +290,9 @@
                                        scmw->setTBvals(currItem);
                                }
                                (*a_scrActions)["editPaste"]->setEnabled(false);
-                               scmw->charPalette->setEnabled(true, currItem);
-                               if (currItem!=nullptr && 
currItem->asTextFrame())
+                               if (currItem != nullptr && 
currItem->asTextFrame())
                                {
+                                       scmw->charPalette->setEnabled(true, 
currItem);
                                        enableTextActions(true, 
currItem->currentCharStyle().font().scName());
                                        
currItem->asTextFrame()->toggleEditModeActions();
                                }


_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to