diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-12 06:29:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-12 06:30:01 +0200 |
| commit | 030e19816a8933a8c6c0a4d8193251446d4ee514 (patch) | |
| tree | 827cfc97a1a8f0f660238e2a3b5472669f0f2077 /src/multimedia/recording | |
| parent | 1c6c85cd7c619cc15c099ae63a5d22bcf661847c (diff) | |
| parent | c7433f84288a33d6a5ea411dabf1618afcacfaf1 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I126bc73db5b5d9b6c26cb9ff5da7ed13a16b378b
Diffstat (limited to 'src/multimedia/recording')
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 7b0234988..d3962b78f 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -578,8 +578,10 @@ void QMediaRecorder::setVolume(qreal volume) { Q_D(QMediaRecorder); - if (d->control) + if (d->control) { + volume = qMax(qreal(0.0), volume); d->control->setVolume(volume); + } } /*! |