diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml index 4f830d2e..d393508d 100644 --- a/src/mainview/MainView.qml +++ b/src/mainview/MainView.qml @@ -177,6 +177,19 @@ Window { // ConversationSmartListViewItemDelegate provides UI information function setMainView(currentUserDisplayName, currentUserAlias, currentUID, callStackViewShouldShow, isAudioOnly, callState) { + if (!(communicationPageMessageWebView.jsLoaded)) { + communicationPageMessageWebView.jsLoadedChanged.connect( + function(currentUserDisplayName, currentUserAlias, currentUID, + callStackViewShouldShow, isAudioOnly, callState) { + return function() { + setMainView(currentUserDisplayName, currentUserAlias, currentUID, + callStackViewShouldShow, isAudioOnly, callState) + } + }(currentUserDisplayName, currentUserAlias, currentUID, + callStackViewShouldShow, isAudioOnly, callState)) + return + } + if (callStackViewShouldShow) { if (inSettingsView) { toggleSettingsView() diff --git a/src/mainview/components/MessageWebView.qml b/src/mainview/components/MessageWebView.qml index 1b9dd363..6b951554 100644 --- a/src/mainview/components/MessageWebView.qml +++ b/src/mainview/components/MessageWebView.qml @@ -32,6 +32,7 @@ Rectangle { property int messageWebViewHeaderPreferredHeight: 64 property string headerUserAliasLabelText: "" property string headerUserUserNameLabelText: "" + property bool jsLoaded: false signal needToHideConversationInCall @@ -256,7 +257,8 @@ Rectangle { messageWebView.runJavaScript(UtilsAdapter.qStringFromFile( ":/qwebchannel.js")) messageWebView.runJavaScript(UtilsAdapter.qStringFromFile( - ":/chatview.js")) + ":/chatview.js"), + function(){jsLoaded = true}) messageWebView.runJavaScript("init_i18n();") messageWebView.runJavaScript("displayNavbar(false);") }