OptionsTabChat::restoreOptions(): Make ck_tabChats setting more obvio…

…usly correct, the old code might be fine, but this is easier to understand
psi-im · Nov 2, 2008 · 9f90158 · 9f90158
1 parent 316d25b
commit 9f90158
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/options/opt_chat.cpp b/src/options/opt_chat.cpp
@@ -174,9 +174,9 @@ void OptionsTabChat::restoreOptions()
 	d->ck_alertOpenChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() );
 	d->ck_raiseChatWindow->setChecked( PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool() );
 	d->ck_smallChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool() );
+	d->ck_tabChats->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() );
 	if(PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool()) {
 		d->cb_tabGrouping->setEnabled(true);
-		d->ck_tabChats->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() );
 	} else {
 		d->cb_tabGrouping->setEnabled(false);
 	}

diff --git a/src/tabs/tabdlg.cpp b/src/tabs/tabdlg.cpp
@@ -600,7 +600,6 @@ void TabDlg::dropEvent(QDropEvent *event)
 	PsiTabBar* source = dynamic_cast<PsiTabBar*>(event->source());
 	if (source) {
 		PsiTabWidget* barParent = source->psiTabWidget();
-		if (remoteTab >= barParent->count()) return;
 		QWidget* widget = barParent->widget(remoteTab);
 		TabbableWidget* chat = dynamic_cast<TabbableWidget*>(widget);
 		TabDlg *dlg = tabManager_->getManagingTabs(chat);