ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to get rid of leftover QSharedMemory instance after crash

This commit is contained in:
Nadia Holmquist Pedersen 2023-12-22 01:35:45 +01:00
parent 084747abc5
commit 752b37ed82
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/frontend/qt_sdl/Platform.cpp
View File

@ -66,12 +66,25 @@ void IPCInit()
IPCBuffer = new QSharedMemory("melonIPC"); IPCBuffer = new QSharedMemory("melonIPC");
#if !defined(Q_OS_WINDOWS)
// QSharedMemory instances can be left over from crashed processes on UNIX platforms.
// To prevent melonDS thinking there's another instance, we attach and then immediately detach from the
// shared memory. If no other process was actually using it, it'll be destroyed and we'll have a clean
// shared memory buffer after creating it again below.
if (IPCBuffer->attach())
{
IPCBuffer->detach();
delete IPCBuffer;
IPCBuffer = new QSharedMemory("melonIPC");
}
#endif
if (!IPCBuffer->attach()) if (!IPCBuffer->attach())
{ {
Log(LogLevel::Info, "IPC sharedmem doesn't exist. creating\n"); Log(LogLevel::Info, "IPC sharedmem doesn't exist. creating\n");
if (!IPCBuffer->create(1024)) if (!IPCBuffer->create(1024))
{ {
Log(LogLevel::Error, "IPC sharedmem create failed :(\n"); Log(LogLevel::Error, "IPC sharedmem create failed: %s\n", IPCBuffer->errorString().toStdString().c_str());
delete IPCBuffer; delete IPCBuffer;
IPCBuffer = nullptr; IPCBuffer = nullptr;
return; return;