In free game mode, the "Change" button cannot be used anymore to pass without changing any letter.

This should be more intuitive.

qt/player_widget.cpp

@@ -140,19 +140,33 @@ void PlayerWidget::on_lineEditChange_textChanged()
 {
     pushButtonChange->setEnabled(lineEditChange->hasAcceptableInput() &&
                                  lineEditChange->text() != "");
-    pushButtonPass->setEnabled(lineEditChange->text() == "");
 }
 
 
 void PlayerWidget::on_lineEditChange_returnPressed()
 {
     ASSERT(m_game->getMode() == PublicGame::kFREEGAME,
-           "Trying to pass or change letters while not in free game mode");
+           "Trying to change letters while not in free game mode");
 
-    QString inputLetters = lineEditChange->text();
+    pass(lineEditChange->text());
+}
+
+
+void PlayerWidget::on_pushButtonPass_clicked()
+{
+    ASSERT(m_game->getMode() == PublicGame::kFREEGAME,
+           "Trying to pass while not in free game mode");
+
+    pass("");
+}
+
+
+void PlayerWidget::pass(QString inputLetters)
+{
     // Convert the input string into an internal one
     const wstring &letters =
         m_game->getDic().convertFromInput(qtw(inputLetters));
+
     // Pass the turn (and possibly change letters)
     int res = m_game->freeGamePass(letters);
     if (res == 0)

qt/player_widget.h

@@ -56,11 +56,13 @@ protected:
 private slots:
     void on_pushButtonShuffle_clicked();
     void on_pushButtonChange_clicked() { on_lineEditChange_returnPressed(); }
-    void on_pushButtonPass_clicked() { on_lineEditChange_returnPressed(); }
+    void on_pushButtonPass_clicked();
     void on_lineEditChange_textChanged();
     void on_lineEditChange_returnPressed();
 
 private:
+    void pass(QString inputLetters);
+
     /// Encapsulated game, can be NULL
     PublicGame *m_game;
 

qt/ui/player_widget.ui

@@ -48,6 +48,9 @@
    </item>
    <item row="2" column="2" colspan="2">
     <widget class="QPushButton" name="pushButtonChange">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
      <property name="text">
       <string>_(&quot;Change&quot;)</string>
      </property>