# HG changeset patch # User rubidium # Date 2007-06-10 20:49:11 # Node ID 6d768b32a94e0a30252614bd46ac28470074a3c9 # Parent 9474c60d529d2420e46c86128b3f9769ecb5f8d0 (svn r10085) -Fix [FS#839]: message that you had given money appeared even when an error occured. diff --git a/src/main_gui.cpp b/src/main_gui.cpp --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -80,7 +80,8 @@ void HandleOnEditText(const char *str) money = clamp(money, 0, 20000000); // Clamp between 20 million and 0 /* Give 'id' the money, and substract it from ourself */ - if (!DoCommandP(0, money, id, NULL, CMD_GIVE_MONEY | CMD_MSG(STR_INSUFFICIENT_FUNDS))) break; + int32 ret = DoCommandP(0, money, id, NULL, CMD_GIVE_MONEY | CMD_MSG(STR_INSUFFICIENT_FUNDS)); + if (CmdFailed(ret) || ret == 0) break; // We either did something wrong, or we don't have any money anymore /* Inform the player of this action */ snprintf(msg, sizeof(msg), "%d", money);