aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-01-06 11:19:49 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-01-06 11:19:49 +0000
commit46541b406411ca71e0b676f4f5cee073da124ced (patch)
tree1265090c389f73638dd271b033d13d582bbe44ea
parent2c19339e2925d469867b8be8d08f2f39f19e4a48 (diff)
downloadqmmp-46541b406411ca71e0b676f4f5cee073da124ced.tar.gz
qmmp-46541b406411ca71e0b676f4f5cee073da124ced.tar.bz2
qmmp-46541b406411ca71e0b676f4f5cee073da124ced.zip
fixed bug in volume control
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@739 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/qmmp/volumecontrol.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qmmp/volumecontrol.cpp b/src/qmmp/volumecontrol.cpp
index c15028c2d..4de0dc8a6 100644
--- a/src/qmmp/volumecontrol.cpp
+++ b/src/qmmp/volumecontrol.cpp
@@ -42,7 +42,9 @@ VolumeControl *VolumeControl::create(QObject *parent)
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
if (settings.value("Volume/software_volume", FALSE).toBool())
return new SoftwareVolume(parent);
- VolumeControl *control = Output::currentFactory()->createVolumeControl(parent);
+ VolumeControl *control = 0;
+ if (Output::currentFactory())
+ control = Output::currentFactory()->createVolumeControl(parent);
if (!control)
return new SoftwareVolume(parent);
QTimer *m_timer = new QTimer(control);
@@ -118,6 +120,6 @@ SoftwareVolume *SoftwareVolume::instance()
void SoftwareVolume::setEnabled(bool b)
{
- QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
- settings.setValue("Volume/software_volume", b);
+ QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+ settings.setValue("Volume/software_volume", b);
}