1berry/Soundux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "fix: instance detection (#253)""

Browse Source 
This reverts commit 0f37a36b105328bbeab3816df383a230907f98d6.
This commit is contained in:
D3SOX 2022-05-18 20:12:01 +02:00 committed by Curve
parent b6bc76dc16
commit 07523c314c
No known key found for this signature in database
GPG Key ID: 460F6C466BD35813
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@ -65,11 +65,16 @@ int main(int argc, char **arguments)
gGuard = std::make_shared<guardpp::guard>("soundux-guard"); gGuard = std::make_shared<guardpp::guard>("soundux-guard");
} }
if (gGuard->other_instance()) if (auto other_instance = gGuard->other_instance(); other_instance.has_value() && other_instance.value())
{ {
Fancy::fancy.logTime().failure() << "Another Instance is already running!" << std::endl; Fancy::fancy.logTime().failure() << "Another Instance is already running!" << std::endl;
return 1; return 1;
} }
else if (!other_instance.has_value()) // NOLINT
{
Fancy::fancy.logTime().warning() << "Failed to check for other instances: " << other_instance.error()
<< std::endl;
}
gConfig.load(); gConfig.load();
gData.set(gConfig.data); gData.set(gConfig.data);