Skip to content

Commit 2487d79

Browse files
committed
removed instance in FriendsDialog since it is not used
1 parent d6860b2 commit 2487d79

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

retroshare-gui/src/gui/FriendsDialog.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,12 @@
6060
* #define FRIENDS_DEBUG 1
6161
*****/
6262

63-
static FriendsDialog *instance = NULL;
64-
6563
/** Constructor */
6664
FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
6765
{
6866
/* Invoke the Qt Designer generated object setup routine */
6967
ui.setupUi(this);
7068

71-
if (!instance) instance = this;
72-
7369
#ifdef RS_DIRECT_CHAT
7470
QString msg = tr("Retroshare broadcast chat: messages are sent to all connected friends.");
7571
// "<font color='grey'>" + DateTime::formatTime(QTime::currentTime()) + "</font> -
@@ -185,14 +181,12 @@ FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
185181
FriendsDialog::~FriendsDialog ()
186182
{
187183
rsEvents->unregisterEventsHandler(mEventHandlerId_friends);
184+
#ifdef RS_DIRECT_CHAT
188185
rsEvents->unregisterEventsHandler(mEventHandlerId_chat);
186+
#endif
189187

190188
// save settings
191189
processSettings(false);
192-
193-
if (this == instance) {
194-
instance = NULL;
195-
}
196190
}
197191

198192
void FriendsDialog::activatePage(FriendsDialog::Page page)

0 commit comments

Comments
 (0)