1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/baremetal/debugserverprovidermanager.cpp b/src/plugins/baremetal/debugserverprovidermanager.cpp
index 6a9bbad8a2..5081588783 100644
--- a/src/plugins/baremetal/debugserverprovidermanager.cpp
+++ b/src/plugins/baremetal/debugserverprovidermanager.cpp
@@ -35,6 +35,7 @@
 // UVSC debug servers.
 #include "debugservers/uvsc/simulatoruvscserverprovider.h"
 #include "debugservers/uvsc/stlinkuvscserverprovider.h"
+#include "debugservers/uvsc/jlinkuvscserverprovider.h"
 
 #include <coreplugin/icore.h>
 
@@ -65,7 +66,8 @@ DebugServerProviderManager::DebugServerProviderManager()
                    new StLinkUtilGdbServerProviderFactory,
                    new EBlinkGdbServerProviderFactory,
                    new SimulatorUvscServerProviderFactory,
-                   new StLinkUvscServerProviderFactory})
+                   new StLinkUvscServerProviderFactory,
+                   new JLinkUvscServerProviderFactory})
 {
     m_instance = this;
     m_writer = new Utils::PersistentSettingsWriter(
@@ -150,7 +152,7 @@ void DebugServerProviderManager::saveProviders()
         }
     }
     data.insert(countKeyC, count);
-    m_writer->save(data, Core::ICore::mainWindow());
+    m_writer->save(data, Core::ICore::dialogParent());
 }
 
 QList<IDebugServerProvider *> DebugServerProviderManager::providers()