diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index 272e1f59c..679c72cfc 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -57,7 +57,6 @@
 MainWindow::MainWindow(QWidget* parent) :
 	QMainWindow(parent),
 	ui(new Ui::MainWindow),
-	m_audioDeviceInfo(new AudioDeviceInfo),
 	m_masterTabIndex(0),
 	m_settings(),
 	m_dspEngine(DSPEngine::instance()),
@@ -69,7 +68,7 @@ MainWindow::MainWindow(QWidget* parent) :
 {
 	qDebug() << "MainWindow::MainWindow: start";
 
-	m_settings.setAudioDeviceInfo(m_audioDeviceInfo);
+	m_settings.setAudioDeviceInfo(&m_audioDeviceInfo);
 
 	ui->setupUi(this);
 	createStatusBar();
@@ -739,11 +738,11 @@ void MainWindow::on_action_Loaded_Plugins_triggered()
 
 void MainWindow::on_action_Audio_triggered()
 {
-	AudioDialog audioDialog(m_audioDeviceInfo, this);
+	AudioDialog audioDialog(&m_audioDeviceInfo, this);
 	audioDialog.exec();
-	m_dspEngine->setAudioInputVolume(m_audioDeviceInfo->getInputVolume());
-	m_dspEngine->setAudioInputDeviceIndex(m_audioDeviceInfo->getInputDeviceIndex());
-	m_dspEngine->setAudioOutputDeviceIndex(m_audioDeviceInfo->getOutputDeviceIndex());
+	m_dspEngine->setAudioInputVolume(m_audioDeviceInfo.getInputVolume());
+	m_dspEngine->setAudioInputDeviceIndex(m_audioDeviceInfo.getInputDeviceIndex());
+	m_dspEngine->setAudioOutputDeviceIndex(m_audioDeviceInfo.getOutputDeviceIndex());
 }
 
 void MainWindow::on_action_My_Position_triggered()
diff --git a/sdrbase/mainwindow.h b/sdrbase/mainwindow.h
index 5bc3b5712..575384ce5 100644
--- a/sdrbase/mainwindow.h
+++ b/sdrbase/mainwindow.h
@@ -101,7 +101,7 @@ private:
 	};
 
 	Ui::MainWindow* ui;
-	AudioDeviceInfo* m_audioDeviceInfo;
+	AudioDeviceInfo m_audioDeviceInfo;
 	MessageQueue m_inputMessageQueue;
 	MainSettings m_settings;
 	std::vector<DeviceUISet*> m_deviceUIs;