[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konversation] src/dcc: Don't crash if the retry button doesn't exist in DCC resume dialog
From:       Peter Simonsson <peter.simonsson () gmail ! com>
Date:       2016-10-01 19:23:20
Message-ID: E1bqPsW-0002z1-OV () code ! kde ! org
[Download RAW message or body]

Git commit 5c36950ec0d9d1d2c25ee729a5cd997fd4d8f256 by Peter Simonsson.
Committed on 01/10/2016 at 19:23.
Pushed by psn into branch 'master'.

Don't crash if the retry button doesn't exist in DCC resume dialog

BUG:368255

M  +4    -2    src/dcc/resumedialog.cpp

http://commits.kde.org/konversation/5c36950ec0d9d1d2c25ee729a5cd997fd4d8f256

diff --git a/src/dcc/resumedialog.cpp b/src/dcc/resumedialog.cpp
index cc9ce19..c389678 100644
--- a/src/dcc/resumedialog.cpp
+++ b/src/dcc/resumedialog.cpp
@@ -164,7 +164,8 @@ namespace Konversation
                 m_buttonBox->button(QDialogButtonBox::Ok)->setText(i18n("&=
Overwrite"));
                 m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_en=
abledActions & RA_Overwrite);
 =

-                m_buttonBox->button(QDialogButtonBox::Retry)->setEnabled(t=
rue);
+                if(m_buttonBox->standardButtons() & QDialogButtonBox::Retr=
y)
+                    m_buttonBox->button(QDialogButtonBox::Retry)->setEnabl=
ed(true);
                 if (m_enabledActions & RA_OverwriteDefaultPath)
                     m_overwriteDefaultPathCheckBox->setEnabled(false);
             }
@@ -173,7 +174,8 @@ namespace Konversation
                 m_buttonBox->button(QDialogButtonBox::Ok)->setText(i18n("R=
&ename"));
                 m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_en=
abledActions & RA_Rename);
 =

-                m_buttonBox->button(QDialogButtonBox::Retry)->setEnabled(f=
alse);
+                if(m_buttonBox->standardButtons() & QDialogButtonBox::Retr=
y)
+                    m_buttonBox->button(QDialogButtonBox::Retry)->setEnabl=
ed(false);
                 if (m_enabledActions & RA_OverwriteDefaultPath)
                     m_overwriteDefaultPathCheckBox->setEnabled(true);
             }
[prev in list] [next in list] [prev in thread] [next in thread]