Fix screen share calls

2 files changed, 17 insertions, 16 deletions

diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml

index 79fd2fc9..33ad4cfa 100644
--- a/resources/qml/voip/PlaceCall.qml
+++ b/resources/qml/voip/PlaceCall.qml
@@ -108,10 +108,15 @@ Popup {
                 text: qsTr("Screen")
                 icon.source: "qrc:/icons/icons/ui/screen-share.svg"
                 onClicked: {
-                    var dialog = screenShareDialog.createObject(timelineRoot);
-                    dialog.open();
-                    timelineRoot.destroyOnClose(dialog);
-                    close();
+                    if (buttonLayout.validateMic()) {
+                        Settings.microphone = micCombo.currentText;
+                        Settings.camera = cameraCombo.currentText;
+
+                        var dialog = screenShareDialog.createObject(timelineRoot);
+                        dialog.open();
+                        timelineRoot.destroyOnClose(dialog);
+                        close();
+                    }
                 }
             }
 
diff --git a/resources/qml/voip/ScreenShare.qml b/resources/qml/voip/ScreenShare.qml

index cf58f3fa..f27c4485 100644
--- a/resources/qml/voip/ScreenShare.qml
+++ b/resources/qml/voip/ScreenShare.qml
@@ -83,7 +83,7 @@ Popup {
                 id: pipCheckBox
 
                 enabled: CallManager.cameras.length > 0
-                checked: Settings.screenSharePiP
+                checked: CallManager.cameras.length > 0 && Settings.screenSharePiP
                 Layout.alignment: Qt.AlignRight
             }
 
@@ -125,19 +125,15 @@ Popup {
             Button {
                 text: qsTr("Share")
                 icon.source: "qrc:/icons/icons/ui/screen-share.svg"
+
                 onClicked: {
-                    if (buttonLayout.validateMic()) {
-                        Settings.microphone = micCombo.currentText;
-                        if (pipCheckBox.checked)
-                            Settings.camera = cameraCombo.currentText;
+                    Settings.screenShareFrameRate = frameRateCombo.currentText;
+                    Settings.screenSharePiP = pipCheckBox.checked;
+                    Settings.screenShareRemoteVideo = remoteVideoCheckBox.checked;
+                    Settings.screenShareHideCursor = hideCursorCheckBox.checked;
 
-                        Settings.screenShareFrameRate = frameRateCombo.currentText;
-                        Settings.screenSharePiP = pipCheckBox.checked;
-                        Settings.screenShareRemoteVideo = remoteVideoCheckBox.checked;
-                        Settings.screenShareHideCursor = hideCursorCheckBox.checked;
-                        CallManager.sendInvite(room.roomId, CallType.SCREEN, windowCombo.currentIndex);
-                        close();
-                    }
+                    CallManager.sendInvite(room.roomId, CallType.SCREEN, windowCombo.currentIndex);
+                    close();
                 }
             }