Skip to content
Permalink
Browse files

Rename 'missing magic argument' error to 'no arguments' in overlay he…

…lper.

Now that the helper takes more than one argument, the
old name is not descriptive enough.
  • Loading branch information...
mkrautz committed Feb 27, 2015
1 parent 6c446e4 commit b29df64a04b08fea9c8e8212591b1dfc98f1f534
Showing with 5 additions and 5 deletions.
  1. +1 −1 overlay/overlay_exe/overlay_exe.cpp
  2. +4 −4 overlay/overlay_exe/overlay_exe.h
@@ -128,7 +128,7 @@ int main(int argc, char **argv) {
size_t sep = commandLine.find(doubleSpace);
if (sep == std::string::npos) {
Alert(L"Mumble Overlay", L"This program is not meant to be run by itself. Run 'mumble.exe' instead.");
return OVERLAY_HELPER_ERROR_EXE_MISSING_MAGIC_ARGUMENT;
return OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS;
}

// The Mumble process passes the overlay magic number,
@@ -40,9 +40,9 @@ const wchar_t *MUMBLE_OVERLAY_DLL_NAME = L"mumble_ol_x64.dll";
/// OverlayHelperError represents exit codes returned by the
/// overlay helper process (mumble_ol.exe) on Windows.
enum OverlayHelperError {
/// The overlay helper process was not passed a magic
/// number as its first and only argument.
OVERLAY_HELPER_ERROR_EXE_MISSING_MAGIC_ARGUMENT = -1,
/// The overlay helper process was not passed any
/// arguments.
OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS = -1,
/// The magic number on the command line of the overlay
/// helper process could not be converted to an integer.
OVERLAY_HELPER_ERROR_EXE_INVALID_MAGIC_ARGUMENT = -2,
@@ -92,7 +92,7 @@ enum OverlayHelperError {
static inline const char *OverlayHelperErrorToString(OverlayHelperError err) {
#define OHE(x) case x: return #x
switch (err) {
OHE(OVERLAY_HELPER_ERROR_EXE_MISSING_MAGIC_ARGUMENT);
OHE(OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS);
OHE(OVERLAY_HELPER_ERROR_EXE_INVALID_MAGIC_ARGUMENT);
OHE(OVERLAY_HELPER_ERROR_EXE_MAGIC_MISMATCH);
OHE(OVERLAY_HELPER_ERROR_EXE_CONFIGURE_ENVIRONMENT);

0 comments on commit b29df64

Please sign in to comment.
You can’t perform that action at this time.