preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13175 from hrydgard/spawn-new-instance

Browse Source 
Windows: Add file menu command to easily load up a new identical instance of PPSSPP.
This commit is contained in:
Henrik Rydgård
2020-07-21 00:21:27 +02:00
committed by GitHub
parent 9489c37c4b 3c29545014
commit 6280d1b11c
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Windows/MainWindowMenu.cpp
+5
View File
@@ -227,6 +227,7 @@ namespace MainWindow {
TranslateMenuItem(menu, ID_FILE_LOAD);
TranslateMenuItem(menu, ID_FILE_LOAD_DIR);
TranslateMenuItem(menu, ID_FILE_LOAD_MEMSTICK);
TranslateMenuItem(menu, ID_FILE_OPEN_NEW_INSTANCE);
TranslateMenuItem(menu, ID_FILE_MEMSTICK);
TranslateMenuItem(menu, ID_FILE_SAVESTATE_SLOT_MENU, useDefHotkey(VIRTKEY_NEXT_SLOT) ? L"\tF3" : L"");
TranslateMenuItem(menu, ID_FILE_QUICKLOADSTATE, useDefHotkey(VIRTKEY_LOAD_STATE) ? L"\tF4" : L"");
@@ -569,6 +570,10 @@ namespace MainWindow {
BrowseAndBoot(GetSysDirectory(DIRECTORY_GAME));
break;
case ID_FILE_OPEN_NEW_INSTANCE:
W32Util::SpawnNewInstance(false);
break;
case ID_FILE_MEMSTICK:
ShellExecute(NULL, L"open", ConvertUTF8ToWString(g_Config.memStickDirectory).c_str(), 0, 0, SW_SHOW);
break;
Windows/W32Util/Misc.cpp
+6 -4
View File
@@ -154,6 +154,12 @@ namespace W32Util
}
void ExitAndRestart(bool overrideArgs, const std::string &args) {
SpawnNewInstance(overrideArgs, args);
ExitProcess(0);
}
void SpawnNewInstance(bool overrideArgs, const std::string &args) {
// This preserves arguments (for example, config file) and working directory.
std::wstring workingDirectory;
std::wstring moduleFilename;
@@ -168,13 +174,9 @@ namespace W32Util
cmdline = RemoveExecutableFromCommandLine(GetCommandLineW());
}
ShellExecute(nullptr, nullptr, moduleFilename.c_str(), cmdline, workingDirectory.c_str(), SW_SHOW);
ExitProcess(0);
}
}
GenericListControl::GenericListControl(HWND hwnd, const GenericListViewDef& def)
: handle(hwnd), columns(def.columns),columnCount(def.columnCount),valid(false),
inResizeColumns(false),updating(false)
Windows/W32Util/Misc.h
+1
View File
@@ -12,6 +12,7 @@ namespace W32Util
BOOL CopyTextToClipboard(HWND hwnd, const std::wstring &wtext);
void MakeTopMost(HWND hwnd, bool topMost);
void ExitAndRestart(bool overrideArgs = false, const std::string &args = "");
void SpawnNewInstance(bool overrideArgs = false, const std::string &args = "");
void GetSelfExecuteParams(std::wstring &workingDirectory, std::wstring &moduleFilename);
}
Windows/ppsspp.rc
+3
View File
@@ -65,6 +65,7 @@ IDB_IMAGE_PSP IMAGE "pspmode.png"
IDR_ACCELS ACCELERATORS
BEGIN
"O", ID_FILE_LOAD, VIRTKEY, CONTROL, NOINVERT
"I", ID_FILE_OPEN_NEW_INSTANCE, VIRTKEY, CONTROL, NOINVERT
"W", ID_EMULATION_STOP, VIRTKEY, CONTROL, NOINVERT
"B", ID_EMULATION_RESET, VIRTKEY, CONTROL, NOINVERT
"T", ID_EMULATION_CHEATS, VIRTKEY, CONTROL, NOINVERT
@@ -480,6 +481,8 @@ BEGIN
MENUITEM "", 0, MFT_SEPARATOR
MENUITEM "Open Memory Stick", ID_FILE_MEMSTICK
MENUITEM "", 0, MFT_SEPARATOR
MENUITEM "Open New Instance", ID_FILE_OPEN_NEW_INSTANCE
MENUITEM "", 0, MFT_SEPARATOR
POPUP "Savestate Slot", ID_FILE_SAVESTATE_SLOT_MENU
BEGIN
Windows/resource.h
+1
View File
@@ -22,6 +22,7 @@
#define WHEEL_DELTA 120
#define ID_DEBUG_LOG 121
#define ID_DEBUG_BREAKPOINTS 122
#define ID_FILE_OPEN_NEW_INSTANCE 123
#define ID_FILE_LOADSTATEFILE 126
#define ID_FILE_SAVESTATEFILE 127
#define ID_EMULATION_RESET 130