diff options
| author | David Lönnhager <david.l@mullvad.net> | 2019-12-11 13:29:50 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2019-12-16 15:16:19 +0100 |
| commit | 11ab41a02e34c0f3907faa5891f64da366bbc8c2 (patch) | |
| tree | cdef956018d9dd61e654f2157b879dced9b52ce6 /windows/nsis-plugins/src/tray/tray.cpp | |
| parent | 99eb972eb7c995216ce0b337b14c94cd89254ab4 (diff) | |
| download | mullvadvpn-11ab41a02e34c0f3907faa5891f64da366bbc8c2.tar.xz mullvadvpn-11ab41a02e34c0f3907faa5891f64da366bbc8c2.zip | |
Get rid of duplicate nsis constants
Diffstat (limited to 'windows/nsis-plugins/src/tray/tray.cpp')
| -rw-r--r-- | windows/nsis-plugins/src/tray/tray.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/windows/nsis-plugins/src/tray/tray.cpp b/windows/nsis-plugins/src/tray/tray.cpp index 3e52ea6e1e..dc5c02ea91 100644 --- a/windows/nsis-plugins/src/tray/tray.cpp +++ b/windows/nsis-plugins/src/tray/tray.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "../error.h" #include "trayparser.h" #include "trayjuggler.h" #include "resource.h" @@ -116,11 +117,6 @@ void UpdateRegistry(common::registry::RegistryKey ®key, const std::wstring &v // Ensure the GUI's tray icon is placed in the visible part of the notification area. // This is accomplished by updating a binary blob in the registry. // -enum class PromoteTrayIconStatus -{ - GENERAL_ERROR = 0, - SUCCESS -}; void __declspec(dllexport) NSISCALL PromoteTrayIcon ( @@ -173,16 +169,16 @@ void __declspec(dllexport) NSISCALL PromoteTrayIcon } pushstring(L""); - pushint(PromoteTrayIconStatus::SUCCESS); + pushint(NsisStatus::SUCCESS); } catch (std::exception &err) { pushstring(common::string::ToWide(err.what()).c_str()); - pushint(PromoteTrayIconStatus::GENERAL_ERROR); + pushint(NsisStatus::GENERAL_ERROR); } catch (...) { pushstring(L"Unspecified error"); - pushint(PromoteTrayIconStatus::GENERAL_ERROR); + pushint(NsisStatus::GENERAL_ERROR); } } |