jonah/Soundux
1
0
Fork 0
mirror of https://github.com/Soundux/Soundux.git synced 2025-12-20 00:06:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(deps): update guardpp

Browse Source
This commit is contained in:
Curve
2022-01-08 13:57:35 +01:00
parent 51a9599a85
commit d59646298b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -90,7 +90,7 @@ set(HTTPLIB_REQUIRE_OPENSSL ON)
add_subdirectory(lib/cpp-httplib EXCLUDE_FROM_ALL)
target_include_directories(soundux SYSTEM PRIVATE "lib/cpp-httplib")
target_link_libraries(soundux PRIVATE webview nfd tiny-process-library tray guard httplib lockpp libremidi)
target_link_libraries(soundux PRIVATE webview nfd tiny-process-library tray guardpp httplib lockpp libremidi)
if (${EMBED_PATH} STREQUAL "OFF")
message("Web-content will not be embedded")

2
lib/guardpp

Submodule lib/guardpp updated: 51816d2f7e...57cab714c0

2
src/core/global/globals.hpp
View File

@@ -37,7 +37,7 @@ namespace Soundux
inline std::unique_ptr<Objects::Window> gGui;
inline std::shared_ptr<Objects::Hotkeys> gHotKeys;
inline std::shared_ptr<Instance::Guard> gGuard;
inline std::shared_ptr<guardpp::guard> gGuard;
/* Allows for fast & easy sound access, is populated on start up */
inline sxl::var_guard<std::map<std::uint32_t, std::reference_wrapper<Objects::Sound>>> gSounds;

6
src/main.cpp
View File

@@ -56,16 +56,16 @@ int main(int argc, char **arguments)
}
backward::SignalHandling crashHandler;
gGuard = std::make_shared<Instance::Guard>("soundux-guard");
gGuard = std::make_shared<guardpp::guard>("soundux-guard");
if (std::find(args.begin(), args.end(), "--reset-mutex") != args.end())
{
gGuard->reset();
gGuard.reset();
gGuard = std::make_shared<Instance::Guard>("soundux-guard");
gGuard = std::make_shared<guardpp::guard>("soundux-guard");
}
if (gGuard->isAnotherRunning())
if (gGuard->other_instance())
{
Fancy::fancy.logTime().failure() << "Another Instance is already running!" << std::endl;
return 1;