diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
| commit | eb2e62609992ab8b47f8805f2bc2cafce271b66f (patch) | |
| tree | 58d6c387f910e3a3348a6528127f4216b524ec57 /src/gui/socialwindow.cpp | |
| parent | 05dc1666dc794ed6aa7f6568b768c652f8922c4e (diff) | |
| parent | 8d06606835e3d01f537ebe96de8b216e64a1f969 (diff) | |
| download | mana-lpc2012.tar.gz mana-lpc2012.tar.bz2 mana-lpc2012.tar.xz mana-lpc2012.zip | |
Merge branch 'master' into lpc2012lpc2012
Diffstat (limited to 'src/gui/socialwindow.cpp')
| -rw-r--r-- | src/gui/socialwindow.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 1b960d64..437f9d01 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -33,8 +33,6 @@ #include "gui/widgets/avatarlistbox.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/button.h" -#include "gui/widgets/container.h" -#include "gui/widgets/label.h" #include "gui/widgets/linkhandler.h" #include "gui/widgets/popup.h" #include "gui/widgets/scrollarea.h" @@ -47,7 +45,6 @@ #include "resources/theme.h" -#include "utils/dtor.h" #include "utils/gettext.h" #include "utils/stringutils.h" @@ -618,7 +615,7 @@ void SocialWindow::showPartyCreate() { new OkDialog(_("Create Party"), _("Cannot create party. You are already in a party"), - this); + true, this); return; } |