AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-13 11:11:22 +00:00
Code Issues Projects Releases Wiki Activity

Skinned CMDL fix

Browse Source
This commit is contained in:
Jack Andersen 2019-05-08 13:38:22 -10:00
parent 233d13ceb9
commit 80d334ec69
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl

@ -1 +1 @@
Subproject commit 43536e34f1d820c7b88c71f77c3ccd7b3d7bc35c Subproject commit b2bd959c141af761f981d123316df87a86653e7a

6
visigen/MainXlib.cpp
View File

@ -245,7 +245,6 @@ int main(int argc, const char** argv) {
int x11Fd = ConnectionNumber(xDisp); int x11Fd = ConnectionNumber(xDisp);
/* Spawn client thread */ /* Spawn client thread */
bool clientRunning = true;
std::mutex initmt; std::mutex initmt;
std::condition_variable initcv; std::condition_variable initcv;
std::unique_lock<std::mutex> outerLk(initmt); std::unique_lock<std::mutex> outerLk(initmt);
@ -260,7 +259,6 @@ int main(int argc, const char** argv) {
XUnlockDisplay(xDisp); XUnlockDisplay(xDisp);
renderer.Run(UpdatePercent); renderer.Run(UpdatePercent);
clientRunning = false;
XLockDisplay(xDisp); XLockDisplay(xDisp);
XClientMessageEvent exitEvent = {}; XClientMessageEvent exitEvent = {};
@ -270,10 +268,12 @@ int main(int argc, const char** argv) {
XSendEvent(xDisp, windowId, 0, 0, reinterpret_cast<XEvent*>(&exitEvent)); XSendEvent(xDisp, windowId, 0, 0, reinterpret_cast<XEvent*>(&exitEvent));
XFlush(xDisp); XFlush(xDisp);
XUnlockDisplay(xDisp); XUnlockDisplay(xDisp);
pthread_kill(mainThread, SIGUSR2);
}); });
initcv.wait(outerLk); initcv.wait(outerLk);
/* Begin application event loop */ /* Begin application event loop */
bool clientRunning = true;
while (clientRunning) { while (clientRunning) {
fd_set fds; fd_set fds;
FD_ZERO(&fds); FD_ZERO(&fds);
@ -291,6 +291,8 @@ int main(int argc, const char** argv) {
XNextEvent(xDisp, &event); XNextEvent(xDisp, &event);
if (XFilterEvent(&event, None)) if (XFilterEvent(&event, None))
continue; continue;
if (event.type == ClientMessage)
clientRunning = false;
} }
XUnlockDisplay(xDisp); XUnlockDisplay(xDisp);
} }