diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-10-11 20:16:38 +0300 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-10-11 20:16:38 +0300 |
| commit | c7433f84288a33d6a5ea411dabf1618afcacfaf1 (patch) | |
| tree | 40fd93907c281b8947bc8db916419e0e9b928c6e /src/multimedia/recording | |
| parent | 54521ea05d2208a31b6111d5b9248ca7bf2f97ec (diff) | |
| parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
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); + } } /*! |