sync

Classes/gframe/event_handler.cpp

@@ -149,6 +149,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 						mainGame->ShowElement(mainGame->wSinglePlay);
 					else
 						mainGame->ShowElement(mainGame->wLanWindow);
+					if(exit_on_return)
+						mainGame->device->closeDevice();
 				} else {
 					DuelClient::SendPacketToServer(CTOS_SURRENDER);
 				}

Classes/gframe/gframe.cpp

@@ -59,7 +59,7 @@ int main(int argc, char* argv[]) {
 				event.GUIEvent.Caller = ygo::mainGame->btnJoinHost;
 				ygo::mainGame->device->postEventFromUser(event);
 		} else if(!strcmp(argv[i], "-j")) { // Join host
-				event.GUIEvent.Caller = ygo::mainGame->btnDeckEdit;
+				ygo::mainGame->HideElement(ygo::mainGame->wMainMenu);
 				ygo::mainGame->device->postEventFromUser(event);
 		} else if(!strcmp(argv[i], "-r")) { // Replay
 				event.GUIEvent.Caller = ygo::mainGame->btnReplayMode;