Revert "message for cancelled trade route even for domestic trade rou…

…tes (sender civ == receiver civ)", causes "No such object":

This reverts commit fe3b57c.

Messagebox(GameObj.cpp Error): No such object

Continue?

(ctp2:385): Gtk-CRITICAL **: 18:45:55.493: IA__gtk_main_quit: assertion 'main_loops != NULL' failed

(ctp2:385): Gtk-CRITICAL **: 18:45:55.495: IA__gtk_main_quit: assertion 'main_loops != NULL' failed

(ctp2:385): Gtk-CRITICAL **: 18:45:55.496: IA__gtk_main_quit: assertion 'main_loops != NULL' failed

(ctp2:385): Gtk-CRITICAL **: 18:45:55.498: IA__gtk_main_quit: assertion 'main_loops != NULL' failed

(ctp2:385): Gtk-CRITICAL **: 18:45:55.506: IA__gtk_main_quit: assertion 'main_loops != NULL' failed

Thread 1 "ctp2" received signal SIGSEGV, Segmentation fault.
0x00005555557902ba in UnitData::GetOwner() const ()
(gdb) bt
#0  0x00005555557902ba in UnitData::GetOwner() const ()
civctp2#1  0x00005555560917d4 in Unit::GetOwner() const ()
civctp2#2  0x000055555608c8b0 in TradeRoute::RemoveAllReferences(CAUSE_KILL_TRADE_ROUTE) ()
civctp2#3  0x000055555608c658 in TradeRoute::KillRoute(CAUSE_KILL_TRADE_ROUTE) ()
civctp2#4  0x000055555578fe8e in TradeRoute::Kill(CAUSE_KILL_TRADE_ROUTE) ()
civctp2#5  0x000055555600931e in CityData::~CityData() ()
civctp2#6  0x0000555556009504 in CityData::~CityData() ()
civctp2#7  0x00005555560985b8 in UnitData::~UnitData() ()
civctp2#8  0x000055555609869c in UnitData::~UnitData() ()
civctp2#9  0x0000555556043a05 in GameObj_Delete(GameObj**, unsigned int) ()
civctp2#10 0x0000555556052891 in ObjPool::Del(ID const&) ()
civctp2#11 0x00005555560912ee in Unit::RemoveAllReferences(CAUSE_REMOVE_ARMY, int) ()
civctp2#12 0x0000555556090ae2 in Unit::KillUnit(CAUSE_REMOVE_ARMY, int) ()
civctp2#13 0x00005555558bcfd4 in Unit::Kill(CAUSE_REMOVE_ARMY, int) ()
civctp2#14 0x00005555560179fc in CityData::CityToPark(int) ()
civctp2#15 0x00005555560a0dd2 in UnitData::CityToPark(int) ()
civctp2#16 0x000055555609446f in Unit::CityToPark(int) ()
civctp2#17 0x00005555560c6171 in CreateParkEvent::GEVHookCallback(GAME_EVENT, GameEventArgList*) ()
civctp2#18 0x0000555555fc0500 in GameEventHook::Activate(GameEventArgList*, int, int&) const ()
civctp2#19 0x0000555555fbd9c4 in GameEventManager::ActivateHook(GAME_EVENT, GameEventArgList*, int, int&) ()
civctp2#20 0x0000555555fbff27 in GameEvent::Process() ()
civctp2#21 0x0000555555fbd6b4 in GameEventManager::ProcessHead() ()
civctp2#22 0x0000555555fbd5e3 in GameEventManager::Process() ()
civctp2#23 0x0000555555780f4b in CivApp::Process() ()
civctp2#24 0x0000555555776cec in CivMain(int, char**) ()
civctp2#25 0x0000555555776889 in main ()

# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
#
# Date:      Sat Dec 28 19:51:22 2019 +0100
#
# On branch master4testing
# Your branch is ahead of 'origin/master4testing' by 1 commit.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#	modified:   ctp2_code/gs/gameobj/TradeRoute.cpp
#

ctp2_code/gs/gameobj/TradeRoute.cpp

@@ -49,7 +49,7 @@ void TradeRoute::RemoveAllReferences(CAUSE_KILL_TRADE_ROUTE cause)
 		dest.DelTradeRoute(*this);
 
 	if(g_theUnitPool->IsValid(source) && g_theUnitPool->IsValid(dest)) {
-	    // if(source.GetOwner() != dest.GetOwner()) {
+		if(source.GetOwner() != dest.GetOwner()) {
 			if(cause == CAUSE_KILL_TRADE_ROUTE_SENDER_KILLED) {
 				SlicObject *so = new SlicObject("360SenderKilledTradeRoute");
 				ROUTE_TYPE type;
@@ -62,7 +62,7 @@ void TradeRoute::RemoveAllReferences(CAUSE_KILL_TRADE_ROUTE cause)
 				so->AddRecipient(dest.GetOwner());
 				g_slicEngine->Execute(so);
 			}
-	     // }
+		}
 	}
 				ROUTE_TYPE type;
 				sint32 good;