For commands in links in chat ask before executing command.

2 files changed, 9 insertions, 4 deletions

diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index b3a0ced78..5bed12f72 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -169,6 +169,8 @@ ChatWindow::ChatWindow() :
     mColorPicker->addActionListener(this);
     mColorPicker->setSelected(mChatColor);
 
+    mItemLinkHandler->setAllowCommands(false);
+
     loadWindowState();
 
     mColorPicker->setPosition(this->getWidth() - mColorPicker->getWidth()
diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp
index 62636fc16..e08177ef4 100644
--- a/src/gui/windows/confirmdialog.cpp
+++ b/src/gui/windows/confirmdialog.cpp
@@ -77,12 +77,15 @@ void ConfirmDialog::postInit()
     if (width < inWidth)
         width = inWidth;
 
-    setContentSize(mTextBox->getMinWidth() + fontHeight, height + fontHeight +
-                   noButton->getHeight());
+    int windowWidth = width;
+    if (windowWidth < mTextBox->getMinWidth() + fontHeight)
+    {
+        windowWidth = mTextBox->getMinWidth() + fontHeight;
+    }
+    setContentSize(windowWidth,
+        height + fontHeight + noButton->getHeight());
     mTextBox->setPosition(mPadding, mPadding);
 
-    // 8 is the padding that GUIChan adds to button widgets
-    // (top and bottom combined)
     const int buttonPadding = getOption("buttonPadding", 8);
     yesButton->setPosition((width - inWidth) / 2, height + buttonPadding);
     noButton->setPosition(yesButton->getX() + yesButton->getWidth()