r19560 by jghali - fix #12747 patch brokenness on Windows

scribus-commit scribus-commit at lists.scribus.net
Tue Oct 7 22:06:35 UTC 2014


Author: jghali
Date: Tue Oct  7 22:06:34 2014
New Revision: 19560

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19560
Log:
fix #12747 patch brokenness on Windows

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19560&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Oct  7 22:06:34 2014
@@ -3891,6 +3891,7 @@
 	// The goal of this part of code is to disallow user to open one
 	// doc multiple times.
 	QString FName = fi.absoluteFilePath();
+	QString platfName(QDir::toNativeSeparators(FName));
 	uint windowCount = windows.count();
 	for ( uint i = 0; i < windowCount; ++i )
 	{
@@ -3899,7 +3900,7 @@
 		if (mx && mx->doc()->isModified() && docNameUnmodified.endsWith("*"))
 			docNameUnmodified.resize(docNameUnmodified.length() - 1);
 
-		if (docNameUnmodified == FName)
+		if (docNameUnmodified == platfName)
 		{
 			qApp->restoreOverrideCursor();
 			QMessageBox::information(this, tr("Document is already opened"),




More information about the scribus-commit mailing list