--- qsampler/trunk/src/qsamplerMainForm.ui.h	2005/03/19 12:10:41	479
+++ qsampler/trunk/src/qsamplerMainForm.ui.h	2005/03/31 14:17:19	487
@@ -218,6 +218,7 @@
     // Some child forms are to be created right now.
     m_pMessages = new qsamplerMessages(this);
     m_pDeviceForm = new qsamplerDeviceForm(this, 0, wflags);
+    m_pDeviceForm->setMainForm(this); // An important life immutable!
     // Set message defaults...
     updateMessagesFont();
     updateMessagesLimit();
@@ -666,7 +667,7 @@
 	piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Audio);
 	for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
 		ts << endl;
-		qsamplerDevice device(m_pClient, qsamplerDevice::Audio, piDeviceIDs[iDevice]);
+		qsamplerDevice device(this, qsamplerDevice::Audio, piDeviceIDs[iDevice]);
 		// Audio device specification...
 		ts << "# " << device.deviceTypeName() << " " << device.driverName()
 		   << " " << tr("Device") << " " << iDevice << endl;
@@ -706,7 +707,7 @@
 	piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Midi);
 	for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
 		ts << endl;
-		qsamplerDevice device(m_pClient, qsamplerDevice::Midi, piDeviceIDs[iDevice]);
+		qsamplerDevice device(this, qsamplerDevice::Midi, piDeviceIDs[iDevice]);
 		// MIDI device specification...
         ts << "# " << device.deviceTypeName() << " " << device.driverName()
 		   << " " << tr("Device") << " " << iDevice << endl;