[openMSX-commits] [SCM] wxCatapult branch master updated. RELEASE_0_9_1-63-ga91eddc

[Wouter V. <m97...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "wxCatapult".

The branch, master has been updated
       via  a91eddcc5285bcc7af3f384b920fc1dac4ac54c4 (commit)
      from  ccb621f0d48428d685ac247e35f5b6e04a0af6ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a91eddcc5285bcc7af3f384b920fc1dac4ac54c4
Author: wouter <ver...@gm...>
Date:   Sat Aug 3 21:34:23 2013 +0200

    Fixed somw windows specific compile errors
    
    Introduced in the last commit (not entirely unexpected). Thanks Vampier for
    helping to fix them.

-----------------------------------------------------------------------

Summary of changes:
 src/openMSXController.cpp |   18 ++++++++----------
 src/openMSXController.h   |    1 -
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/openMSXController.cpp b/src/openMSXController.cpp
index cd8ee3a..b74217c 100644
--- a/src/openMSXController.cpp
+++ b/src/openMSXController.cpp
@@ -130,6 +130,12 @@ void openMSXController::HandleEndProcess(wxCommandEvent& event)
 	m_appWindow->m_launch_AbortButton->SetLabel(wxT("Start"));
 	HandleNativeEndProcess();
 	m_commands.clear();
+
+#ifdef __WXMSW__
+	if (!m_pipeActive) {
+		m_connectThread = nullptr;
+	}
+#endif
 }
 
 void openMSXController::HandleStdOut(wxCommandEvent& event)
@@ -1187,7 +1193,7 @@ bool openMSXController::Launch(wxString cmdline)
 	m_catapultWindow = GetActiveWindow();
 	PreLaunch();
 	bool useNamedPipes = DetermenNamedPipeUsage();
-	cmdLine += CreateControlParameter(useNamedPipes);
+	cmdline += CreateControlParameter(useNamedPipes);
 	HANDLE hInputRead, hOutputWrite, hErrorWrite, hErrorRead, hOutputRead;
 	CreatePipes(useNamedPipes, &hInputRead, &hOutputWrite, &hErrorWrite, &hOutputRead, &hErrorRead);
 
@@ -1204,7 +1210,7 @@ bool openMSXController::Launch(wxString cmdline)
 	si.hStdError  = hErrorWrite;
 	si.wShowWindow = wStartupWnd;
 
-	LPTSTR szCmdLine = _tcsdup(cmdLine.c_str());
+	LPTSTR szCmdLine = _tcsdup(cmdline.c_str());
 	if (szCmdLine) {
 		CreateProcess(
 			nullptr, szCmdLine, nullptr, nullptr, true,
@@ -1432,14 +1438,6 @@ void openMSXController::HandlePipeCreated()
 	PostLaunch();
 }
 
-void openMSXController::HandleEndProcess(wxCommandEvent& event)
-{
-	openMSXController::HandleEndProcess(event);
-	if (!m_pipeActive) {
-		m_connectThread = nullptr;
-	}
-}
-
 HWND openMSXController::FindOpenMSXWindow()
 {
 	if (!m_openMsxRunning) return nullptr;
diff --git a/src/openMSXController.h b/src/openMSXController.h
index 6b00d5a..3575be6 100644
--- a/src/openMSXController.h
+++ b/src/openMSXController.h
@@ -168,7 +168,6 @@ private:
 		HWND hWndFound;
 	};
 
-	void HandleEndProcess(wxCommandEvent& event);
 	void HandlePipeCreated();
 
 	HWND FindOpenMSXWindow();


hooks/post-receive
-- 
wxCatapult