From d6deb29ba033bd8cacdcd47f52d898bea7ff04d3 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Fri, 16 Aug 2013 09:38:16 +0200
Subject: [PATCH] Eliminated selectedDir argument to LinkApp::launch()

---
 src/linkapp.cpp | 14 +++++++-------
 src/linkapp.h   |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/linkapp.cpp b/src/linkapp.cpp
index f1676cc..9ea17e1 100644
--- a/src/linkapp.cpp
+++ b/src/linkapp.cpp
@@ -542,18 +542,18 @@ void LinkApp::selector(int startSelection, const string &selectorDir) {
 	Selector sel(gmenu2x, this, selectorDir);
 	int selection = sel.exec(startSelection);
 	if (selection!=-1) {
-		gmenu2x->writeTmp(selection, sel.getDir());
-		launch(sel.getFile(), sel.getDir());
+		const string &selectedDir = sel.getDir();
+		if (!selectedDir.empty()) {
+			selectordir = selectedDir;
+		}
+		gmenu2x->writeTmp(selection, selectedDir);
+		launch(sel.getFile());
 	}
 }
 
-void LinkApp::launch(const string &selectedFile, const string &selectedDir) {
+void LinkApp::launch(const string &selectedFile) {
 	drawRun();
 
-	if (selectedDir.empty())
-		selectordir = getSelectorDir();
-	else
-		selectordir = selectedDir;
 	save();
 
 	if (isOpk()) {
diff --git a/src/linkapp.h b/src/linkapp.h
index 4807cf3..f90850f 100644
--- a/src/linkapp.h
+++ b/src/linkapp.h
@@ -53,9 +53,7 @@ private:
 #endif
 
 	void start();
-	void launch(
-			const std::string &selectedFile = "",
-			const std::string &selectedDir = "");
+	void launch(const std::string &selectedFile = "");
 
 protected:
 	virtual const std::string &searchIcon();