From 7a798f7dbf5b42975f16c217ecb7ea44262f2e8e Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 9 Oct 2015 01:50:09 +0200
Subject: [PATCH] Fixed presets not loading correctly

---
 .gitignore                  |  1 +
 sdrbase/mainwindow.cpp      | 12 +++++++++---
 sdrbase/settings/preset.cpp |  4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 43512679a..e7c0fa7c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ sdrangelove.supp
 .cproject
 .project
 .settings/
+*.cs
diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index e31a92e7a..c6651ccd3 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -330,13 +330,18 @@ void MainWindow::updatePresetControls()
 QTreeWidgetItem* MainWindow::addPresetToTree(const Preset* preset)
 {
 	QTreeWidgetItem* group = 0;
-	for(int i = 0; i < ui->presetTree->topLevelItemCount(); i++) {
-		if(ui->presetTree->topLevelItem(i)->text(0) == preset->getGroup()) {
+
+	for(int i = 0; i < ui->presetTree->topLevelItemCount(); i++)
+	{
+		if(ui->presetTree->topLevelItem(i)->text(0) == preset->getGroup())
+		{
 			group = ui->presetTree->topLevelItem(i);
 			break;
 		}
 	}
-	if(group == 0) {
+
+	if(group == 0)
+	{
 		QStringList sl;
 		sl.append(preset->getGroup());
 		group = new QTreeWidgetItem(ui->presetTree, sl, PGroup);
@@ -344,6 +349,7 @@ QTreeWidgetItem* MainWindow::addPresetToTree(const Preset* preset)
 		group->setExpanded(true);
 		ui->presetTree->sortByColumn(0, Qt::AscendingOrder);
 	}
+
 	QStringList sl;
 	sl.append(QString("%1 kHz").arg(preset->getCenterFrequency() / 1000));
 	sl.append(preset->getDescription());
diff --git a/sdrbase/settings/preset.cpp b/sdrbase/settings/preset.cpp
index 3902cc5fd..69942d31e 100644
--- a/sdrbase/settings/preset.cpp
+++ b/sdrbase/settings/preset.cpp
@@ -115,7 +115,7 @@ bool Preset::deserialize(const QByteArray& data)
 
 			if (!sourceId.isEmpty())
 			{
-				qDebug("Preset::deserialize:  source: id: %ss, ser: %s, seq: %d",
+				qDebug("Preset::deserialize:  source: id: %s, ser: %s, seq: %d",
 					qPrintable(sourceId),
 					qPrintable(sourceSerial),
 					sourceSequence);
@@ -140,6 +140,8 @@ bool Preset::deserialize(const QByteArray& data)
 			qDebug("Preset::deserialize:  channel: id: %s", qPrintable(channel));
 			m_channelConfigs.append(ChannelConfig(channel, config));
 		}
+
+		return true;
 	}
 	else
 	{