diff options
| -rw-r--r-- | overlay/lib.cpp | 2 | ||||
| -rw-r--r-- | src/mumble11x/Overlay.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/overlay/lib.cpp b/overlay/lib.cpp index a31b5c241..d0b5ee26b 100644 --- a/overlay/lib.cpp +++ b/overlay/lib.cpp @@ -502,7 +502,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID) { char *p = strrchr(procname, '\\'); if (p) { - if (_stricmp(p+1, "mumble.exe")==0) + if ((_stricmp(p+1, "mumble.exe")==0) || (_stricmp(p+1, "mumble11x.exe")==0)) bMumble = TRUE; int i =0; while (blacklist[i]) { diff --git a/src/mumble11x/Overlay.cpp b/src/mumble11x/Overlay.cpp index 26954caf9..11d10e711 100644 --- a/src/mumble11x/Overlay.cpp +++ b/src/mumble11x/Overlay.cpp @@ -263,7 +263,7 @@ void Overlay::toggleShow() { } g.s.osOverlay = ns; - if (sm.tryLock()) { + if (sm.sm && sm.tryLock()) { sm.sm->bShow = (g.s.osOverlay != Settings::Nothing); sm.unlock(); } @@ -328,6 +328,9 @@ void Overlay::updateOverlay() { QString str; QList<qpChanCol> linkchans; + if (! sm.sm) + return; + if (! isActive()) return; |