[OMPT-svn-commit] OpenMPT r21524 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sun Aug 25 23:41:32 2024
New Revision: 21524
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21524

Log:
Merged revision(s) 21523 from trunk/OpenMPT:
[Fix] IPC: Selecting the last used OpenMPT instance didn't work with the "simple" FindIPCWindow overload.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/IPCWindow.cpp
   branches/OpenMPT-1.31/mptrack/IPCWindow.h

Modified: branches/OpenMPT-1.31/mptrack/IPCWindow.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/IPCWindow.cpp	Sun Aug 25 23:40:30 2024	(r21523)
+++ branches/OpenMPT-1.31/mptrack/IPCWindow.cpp	Sun Aug 25 23:41:32 2024	(r21524)
@@ -143,11 +143,6 @@
 		return ::SendMessage(ipcWnd, WM_COPYDATA, 0, reinterpret_cast<LPARAM>(&copyData));
 	}
 
-	HWND FindIPCWindow()
-	{
-		return ::FindWindow(ClassName, nullptr);
-	}
-
 	struct EnumWindowState
 	{
 		uintptr_t lastActive = 0;
@@ -218,8 +213,6 @@
 		return state.result;
 	}
 
-
-
 	bool SendToIPC(const std::vector<mpt::PathString> &filenames)
 	{
 		HWND ipcWnd = FindIPCWindow();

Modified: branches/OpenMPT-1.31/mptrack/IPCWindow.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/IPCWindow.h	Sun Aug 25 23:40:30 2024	(r21523)
+++ branches/OpenMPT-1.31/mptrack/IPCWindow.h	Sun Aug 25 23:41:32 2024	(r21524)
@@ -38,16 +38,15 @@
 
 	enum InstanceRequirements
 	{
+		None             = 0x00u,
 		SamePath         = 0x01u,
 		SameSettings     = 0x02u,
 		SameArchitecture = 0x04u,
-		SameVersion      = 0x08u
+		SameVersion      = 0x08u,
 	};
 	MPT_DECLARE_ENUM(InstanceRequirements)
 
-	HWND FindIPCWindow();
-
-	HWND FindIPCWindow(FlagSet<InstanceRequirements> require);
+	HWND FindIPCWindow(FlagSet<InstanceRequirements> require = None);
 
 	// Send file open requests to other OpenMPT instance, if there is one
 	bool SendToIPC(const std::vector<mpt::PathString> &filenames);