From 1177092da650ff539c1d4933737e0bf42a417771 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 14 Apr 2010 20:26:34 +0000 Subject: [PATCH] (svn r19636) -Fix: desync when taking over companies --- src/company_cmd.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 673d1c1fae..f738f07e08 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -595,14 +595,11 @@ static void HandleBankruptcyTakeover(Company *c) SetBit(c->bankrupt_asked, best->index); - if (IsInteractiveCompany(best->index)) { - c->bankrupt_timeout = TAKE_OVER_TIMEOUT; - ShowBuyCompanyDialog(c->index); - return; - } - + c->bankrupt_timeout = TAKE_OVER_TIMEOUT; if (best->is_ai) { AI::NewEvent(best->index, new AIEventCompanyAskMerger(c->index, ClampToI32(c->bankrupt_value))); + } else if (IsInteractiveCompany(best->index)) { + ShowBuyCompanyDialog(c->index); } }