r19458 by jghali - 12572, patch 06/12: startup script does not work

scribus-commit scribus-commit at lists.scribus.net
Sat Aug 30 00:23:36 UTC 2014


Author: jghali
Date: Sat Aug 30 00:23:36 2014
New Revision: 19458

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19458
Log:
12572, patch 06/12: startup script does not work

During the initialization process, the ScribusMainWindow::ScriptRunning
variable was used uninitialized. Its value is now set in the class constructor.

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19458&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Aug 30 00:23:36 2014
@@ -296,6 +296,7 @@
 	UrlLauncher::instance();
 	mainWindowStatusLabel=0;
 	ExternalApp=0;
+	ScriptRunning = 0;
 #ifdef Q_OS_MAC
 	ScQApp->setAttribute(Qt::AA_DontShowIconsInMenus);
 	noIcon = loadIcon("noicon.xpm");
@@ -512,7 +513,6 @@
 void ScribusMainWindow::initDefaultValues()
 {
 	HaveDoc = false;
-	ScriptRunning = 0;
 	view = NULL;
 	doc = NULL;
 	DocNr = 1;




More information about the scribus-commit mailing list