2 files changed, 25 insertions, 0 deletions

diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp
index 45995fd..c89d8c2 100644
--- a/noncore/tools/remote/remotetab.cpp
+++ b/noncore/tools/remote/remotetab.cpp
@@ -42,24 +42,32 @@ RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name)
 
 	layout->addSpacing(1);
 
 	channelGroup = new ChannelGroup(this);
 //	channelGroup->setMaximumHeight(91);
 	layout->addWidget(channelGroup, 0, 0);
 
 	this->setMaximumWidth(240);
 }
 
 int RemoteTab::sendIR()
 {
+	QString curr_remote = topGroup->getRemotesText();
+	if(curr_remote != "")
+		cfg->setGroup(curr_remote);
+	else {
+		QMessageBox::warning(this, tr("Error"), tr("Please select or create\na remote layout"), QMessageBox::Ok, QMessageBox::NoButton);
+		return 0;
+	}
+	
 	const QObject *button = sender();
 	QString string = cfg->readEntry(button->name());
 	if(string != "") {
 		string+='\n';
 		LircHandler lh;
 		return lh.sendIR(string.latin1());
 	}
 	else {
 		QMessageBox::warning(this, tr("Error"), tr("This button has not\nbeen configured"), QMessageBox::Ok, QMessageBox::NoButton);
 		return 0;
 	}
 }
@@ -148,13 +156,17 @@ void RemoteTab::remoteSelected(const QString &string)
 			{
 				cfg->setGroup("Default");
 				((QPushButton *)obj)->setText(cfg->readEntry((QString)obj->name()+"Label") );
 				cfg->setGroup(string);
 			}
 		}
 	}
 }
 
 void RemoteTab::updateRemotesList()
 {
 	topGroup->updateRemotes(cfg);
+	
+	QString curr_remote = topGroup->getRemotesText();
+	if(curr_remote != "")
+		remoteSelected(curr_remote);
 }
diff --git a/noncore/tools/remote/topgroup.cpp b/noncore/tools/remote/topgroup.cpp
index 7f2366b..d4eb6e2 100644
--- a/noncore/tools/remote/topgroup.cpp
+++ b/noncore/tools/remote/topgroup.cpp
@@ -38,21 +38,34 @@ TopGroup::TopGroup(QWidget *parent, const char *name):QWidget(parent,name)
 //	remotes->setGeometry(135,5,95,20);
 
 	QLabel *remoteLabel = new QLabel(remotes, "Remote: ",this,"remoteLabel");
 //	remoteLabel->setGeometry(90,5,40,20);
 	remoteLabel->setAlignment(AlignRight | AlignVCenter);
 
 	layout->addWidget(remoteLabel);
 	layout->addWidget(remotes);
 }
 
 void TopGroup::updateRemotes(Config *cfg)
 {
+	// Save currently selected item if any
+	QString curr_remote = remotes->currentText();
+	
 	remotes->clear();
 	cfg->setGroup("Remotes");
 	remotes->insertStringList(cfg->readListEntry("remoteList", ',') );
+	
+	// Select previously selected item
+	if(curr_remote != "") {
+		for(int i=0;i<remotes->count();i++) {
+			if(remotes->text(i) == curr_remote) {
+				remotes->setCurrentItem(i);
+				break;
+			}
+		}
+	}
 }
 
 QString TopGroup::getRemotesText()
 {
 	return remotes->currentText();
 }