r19457 by jghali - 12572, patch 05/12: fix broken handling of --prefs option

scribus-commit scribus-commit at lists.scribus.net
Sat Aug 30 00:15:20 UTC 2014


Author: jghali
Date: Sat Aug 30 00:15:20 2014
New Revision: 19457

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19457
Log:
12572, patch 05/12: fix broken handling of --prefs option

Modified:
    trunk/Scribus/scribus/scribusapp.cpp

Modified: trunk/Scribus/scribus/scribusapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19457&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp (original)
+++ trunk/Scribus/scribus/scribusapp.cpp Sat Aug 30 00:15:20 2014
@@ -238,10 +238,10 @@
 			prefsUserFile = QFile::decodeName(args[i + 1].toLocal8Bit());
 			if (!QFileInfo(prefsUserFile).exists()) {
 				showHeader();
-				if (fileName.left(1) == "-" || fileName.left(2) == "--") {
-					std::cout << tr("Invalid argument: ").toLocal8Bit().data() << fileName.toLocal8Bit().data() << std::endl;
+				if (prefsUserFile.left(1) == "-" || prefsUserFile.left(2) == "--") {
+					std::cout << tr("Invalid argument: ").toLocal8Bit().data() << prefsUserFile.toLocal8Bit().data() << std::endl;
 				} else {
-					std::cout << tr("File %1 does not exist, aborting.").arg(fileName).toLocal8Bit().data() << std::endl;
+					std::cout << tr("File %1 does not exist, aborting.").arg(prefsUserFile).toLocal8Bit().data() << std::endl;
 				}
 				showUsage();
 				useGUI=false;




More information about the scribus-commit mailing list