src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -1844,21 +1844,6 @@ void mainWindowImpl::provideMyActions(int mode) {
 			}
 		}
 		
-		//if text changed on checked button --> uncheck to prevent unwanted actions
-		if((pushButtonCallCheckString != lastPushButtonCallCheckString && pushButton_CallCheck->isChecked())) { 
-		
-//			cout << "jo" << endl;
-			uncheckMyButtons(); 
-			resetMyButtonsCheckStateMemory();
-		}
-
-		if(pushButtonBetRaiseString == "") {
-
-			pushButton_AllIn->setDisabled(TRUE);
-			horizontalSlider_bet->setDisabled(TRUE);
-			lineEdit_betValue->setDisabled(TRUE);
-		}
-
 		if(mode == 0) {
 			if( currentHand->getSeatsList()->front()->getMyAction() != PLAYER_ACTION_FOLD ) {
 				pushButtonBetRaiseString = "Bet "+QString::number(getMyBetAmount(0))+"$";
@@ -1877,6 +1862,21 @@ void mainWindowImpl::provideMyActions(int mode) {
 				myButtonsCheckable(FALSE);
 			}
 		}
+				
+		//if text changed on checked button --> uncheck to prevent unwanted actions
+		if((pushButtonCallCheckString != lastPushButtonCallCheckString && pushButton_CallCheck->isChecked())) { 
+		
+//			cout << "jo" << endl;
+			uncheckMyButtons(); 
+			resetMyButtonsCheckStateMemory();
+		}
+
+		if(pushButtonBetRaiseString == "") {
+
+			pushButton_AllIn->setDisabled(TRUE);
+			horizontalSlider_bet->setDisabled(TRUE);
+			lineEdit_betValue->setDisabled(TRUE);
+		}
 
 		pushButton_Fold->setText(pushButtonFoldString);
 		pushButton_BetRaise->setText(pushButtonBetRaiseString);
@@ -1898,6 +1898,11 @@ void mainWindowImpl::provideMyActions(int mode) {
 			resetMyButtonsCheckStateMemory();
 		}
 
+		if((mySession->getGameType() == Session::GAME_TYPE_INTERNET || mySession->getGameType() == Session::GAME_TYPE_NETWORK) && !lineEdit_ChatInput->hasFocus() && myConfig->readConfigInt("EnableBetInputFocusSwitch")) { 
+			lineEdit_betValue->setFocus();
+			lineEdit_betValue->selectAll();
+		}
+
 	}
 }