Merge branch 'master' of https://github.com/Fluorohydride/ygopro

gframe/event_handler.cpp

@@ -143,6 +143,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);
 				}

gframe/gframe.cpp

@@ -134,7 +134,7 @@ int main(int argc, char* argv[]) {
 			break;
 		} else if(!strcmp(argv[i], "-j")) { // Join host
 			exit_on_return = !keep_on_return;
-			ClickButton(ygo::mainGame->btnLanMode);
+			ygo::mainGame->HideElement(ygo::mainGame->wMainMenu);
 			ClickButton(ygo::mainGame->btnJoinHost);
 			break;
 		} else if(!strcmp(argv[i], "-r")) { // Replay