Cleanup.

lib/dr1801uv_codeplug.cc

@@ -3269,9 +3269,16 @@ DR1801UVCodeplug::index(Config *config, Context &ctx, const ErrorStack &err) con
 
   // All indices as 0-based. That is, the first channel gets index 0 etc.
 
-  // There can only be one DMR radio ID
-  if (! config->settings()->defaultIdRef()->isNull())
-    ctx.add(config->settings()->defaultId(), 0);
+  // There must be a default DMR radio ID.
+  if (nullptr == ctx.config()->settings()->defaultId()) {
+    errMsg(err) << "No default DMR radio ID specified.";
+    errMsg(err) << "Cannot index codplug for encoding for the BTECH DR-1801UV.";
+    return false;
+  }
+
+  // Map radio IDs
+  for (int i=0; i<ctx.config()->radioIDs()->count(); i++)
+    ctx.add(ctx.config()->radioIDs()->getId(i), i);
 
   // Map digital and DTMF contacts
   for (int i=0, d=0; i<config->contacts()->count(); i++) {

src/application.cc

@@ -709,6 +709,7 @@ void
 Application::onCodeplugDownloaded(Radio *radio, Codeplug *codeplug) {
   _config->clear();
   _mainWindow->setWindowModified(false);
+
   ErrorStack err;
   if (codeplug->decode(_config, err)) {
     _mainWindow->statusBar()->showMessage(tr("Read complete"));

test/configtest.hh

@@ -26,7 +26,7 @@ private slots:
 
   void testMelodyLilypond();
   void testMelodyEncoding();
-  void testMelodyDecoding();
+  void testMelodyDecoding(); 
 
 protected:
   QTextStream _stderr;

test/dr1801_test.cc

@@ -73,6 +73,18 @@ DR1801Test::testBasicConfigReencoding() {
   }
 }
 
+
+void
+DR1801Test::testProstProcessingOfEmptyCodeplug() {
+  Config config;
+  DR1801UVCodeplug codeplug;
+  ErrorStack err;
+
+  config.clear();
+  QVERIFY(codeplug.postprocess(&config, err));
+}
+
+
 QTEST_GUILESS_MAIN(DR1801Test)
 
 

test/dr1801_test.hh

@@ -15,6 +15,7 @@ private slots:
   void testBasicConfigEncoding();
   void testBasicConfigDecoding();
   void testBasicConfigReencoding();
+  void testProstProcessingOfEmptyCodeplug();
 };
 
 #endif // DR1801TEST_HH