[rkward-cvs] SF.net SVN: rkward:[3398] trunk/rkward/rkward/rbackend

[tfry at users.sourceforge.net]

Revision: 3398
          http://rkward.svn.sourceforge.net/rkward/?rev=3398&view=rev
Author:   tfry
Date:     2011-01-27 14:27:53 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
Always use the backend from the _same_ installation location as the frontend.

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp
    trunk/rkward/rkward/rbackend/rkrbackend.cpp

Modified: trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp	2011-01-27 14:13:23 UTC (rev 3397)
+++ trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp	2011-01-27 14:27:53 UTC (rev 3398)
@@ -2,7 +2,7 @@
                           rkfrontendtransmitter  -  description
                              -------------------
     begin                : Thu Nov 04 2010
-    copyright            : (C) 2010 by Thomas Friedrichsmeier
+    copyright            : (C) 2010, 2011 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -28,6 +28,7 @@
 #include <QProcess>
 #include <QLocalServer>
 #include <QLocalSocket>
+#include <QDir>
 
 #include "../version.h"
 #include "../debug.h"
@@ -62,8 +63,8 @@
 	args.append ("--data-dir " + RKSettingsModuleGeneral::filesPath ());
 	backend->setProcessChannelMode (QProcess::MergedChannels);	// at least for now. Seems difficult to get interleaving right, without this.
 	connect (backend, SIGNAL (finished (int, QProcess::ExitStatus)), this, SLOT (backendExit (int)));
-	QString backend_executable = KStandardDirs::findExe ("rkward.rbackend", QCoreApplication::applicationDirPath () + "/rbackend");
-	if (backend_executable.isEmpty ()) backend_executable = KStandardDirs::findExe ("rkward.rbackend", QCoreApplication::applicationDirPath ());
+	QString backend_executable = KStandardDirs::findExe (QDir::toNativeSeparators (QCoreApplication::applicationDirPath () + "/rkward.rbackend"));
+	if (backend_executable.isEmpty ()) backend_executable = KStandardDirs::findExe (QDir::toNativeSeparators (QCoreApplication::applicationDirPath () + "/rbackend/rkward.rbackend"));	// for running directly from the build-dir
 	RK_ASSERT (!backend_executable.isEmpty ());
 	backend->start (backend_executable, args, QIODevice::ReadOnly);
 

Modified: trunk/rkward/rkward/rbackend/rkrbackend.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkrbackend.cpp	2011-01-27 14:13:23 UTC (rev 3397)
+++ trunk/rkward/rkward/rbackend/rkrbackend.cpp	2011-01-27 14:27:53 UTC (rev 3398)
@@ -398,8 +398,8 @@
 			RKRBackend::this_pointer->handleRequest (&request);
 		}
 
+		R_RunExitFinalizers ();
 		Rf_KillAllDevices ();
-		R_RunExitFinalizers ();
 		R_CleanTempDir ();
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.