From 3f719a35b894a4d359436840fa7578eca3becdea Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Tue, 26 Dec 2023 19:25:41 +0300 Subject: [PATCH] [win-nix] changed connection error page path --- win-linux/src/cascapplicationmanagerwrapper.cpp | 9 --------- win-linux/src/main.cpp | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 10cf344c0..69b4dba36 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -1054,15 +1054,6 @@ void CAscApplicationManagerWrapper::startApp() _app.m_pMainWindow->show(_is_maximized); } - if ( QFileInfo::exists(":/noconnect.html") ) { - QString _nc_path = Utils::getAppCommonPath() + "/noconnect.html"; - bool _nc_exist = QFileInfo::exists(_nc_path) || QFile::copy(":/noconnect.html", _nc_path); - - if ( _nc_exist ) { - _app.m_oSettings.connection_error_path = _nc_path.toStdWString(); - } - } - QObject::connect(CExistanceController::getInstance(), &CExistanceController::checked, [] (const QString& name, int uid, bool exists) { if ( !exists ) { QJsonObject _json_obj{{QString::number(uid), exists}}; diff --git a/win-linux/src/main.cpp b/win-linux/src/main.cpp index 4ba773e22..288031d97 100644 --- a/win-linux/src/main.cpp +++ b/win-linux/src/main.cpp @@ -98,6 +98,7 @@ int main( int argc, char *argv[] ) manager->m_oSettings.local_editors_path = app_path + L"/editors/web-apps/apps/api/documents/index.html"; manager->m_oSettings.additional_fonts_folder.push_back(app_path + L"/fonts"); manager->m_oSettings.country = Utils::systemLocationCode().toStdString(); + manager->m_oSettings.connection_error_path = app_path + L"/editors/webext/noconnect.html"; }; if ( InputArgs::contains(L"--version") ) {