aboutsummaryrefslogtreecommitdiff
path: root/primedev/util/utils.h
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2024-01-30 23:15:34 +0100
committerGitHub <noreply@github.com>2024-01-30 23:15:34 +0100
commit7ebdc14a107b23d1255011a7730e1d8463ac9c67 (patch)
tree24cb1a195004f94fdb17b4e29436cb3ab3c33efa /primedev/util/utils.h
parent2f46eb59b02b837367c0e02aba7097673d2f3bbd (diff)
parent6ad955ae0aab8b79910cb4a12777419a78a42a90 (diff)
downloadNorthstarLauncher-7ebdc14a107b23d1255011a7730e1d8463ac9c67.tar.gz
NorthstarLauncher-7ebdc14a107b23d1255011a7730e1d8463ac9c67.zip
Merge branch 'main' into feat/update-for-new-verified-jsonfeat/update-for-new-verified-json
Diffstat (limited to 'primedev/util/utils.h')
-rw-r--r--primedev/util/utils.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/primedev/util/utils.h b/primedev/util/utils.h
index 1a419607..c8cbc7e8 100644
--- a/primedev/util/utils.h
+++ b/primedev/util/utils.h
@@ -2,22 +2,24 @@
void RemoveAsciiControlSequences(char* str, bool allow_color_codes);
-class ScopeGuard
+template <typename T> class ScopeGuard
{
public:
auto operator=(ScopeGuard&) = delete;
ScopeGuard(ScopeGuard&) = delete;
- ScopeGuard(std::function<void()> callback) : m_callback(callback) {}
+ ScopeGuard(T callback) : m_callback(callback) {}
~ScopeGuard()
{
- m_callback();
+ if (!m_dismissed)
+ m_callback();
}
void Dismiss()
{
- m_callback = [] {};
+ m_dismissed = true;
}
private:
- std::function<void()> m_callback;
+ bool m_dismissed = false;
+ T m_callback;
};