diff --git a/SerialPrograms/Source/CommonFramework/SetupSettings.cpp b/SerialPrograms/Source/CommonFramework/SetupSettings.cpp index 13e4e4283..280013c97 100644 --- a/SerialPrograms/Source/CommonFramework/SetupSettings.cpp +++ b/SerialPrograms/Source/CommonFramework/SetupSettings.cpp @@ -150,7 +150,7 @@ void set_permissions(QObject& object){ #if defined(__APPLE__) #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #if QT_CONFIG(permissions) - cout << "Chcecking MacOS Permissions..." << endl; + cout << "Checking MacOS Permissions..." << endl; QCameraPermission camera_permission; switch(qApp->checkPermission(camera_permission)){ case Qt::PermissionStatus::Undetermined: diff --git a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp index f309685b7..8557a8755 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp @@ -28,19 +28,20 @@ namespace FileDownloader{ std::string download_file(Logger& logger, const std::string& url){ QNetworkAccessManager network_access_manager; QByteArray downloaded_data; + std::unique_ptr reply; QEventLoop loop; QObject::connect( &network_access_manager, &QNetworkAccessManager::finished, &loop, [&downloaded_data, &loop](QNetworkReply* reply){ downloaded_data = reply->readAll(); - reply->deleteLater(); +// reply->deleteLater(); loop.exit(); } ); QNetworkRequest request(QUrl(QString::fromStdString(url))); - std::unique_ptr reply(network_access_manager.get(request)); + reply.reset(network_access_manager.get(request)); #if 0 QTimer timer; diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp index 2a8f5e44e..ec3530f3d 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp @@ -228,7 +228,7 @@ VideoSnapshot CameraSession::snapshot(){ } if (!frame.isValid()){ - global_logger_tagged().log("QVideoFrame is null.", COLOR_RED); + m_logger.log("QVideoFrame is null.", COLOR_RED); return VideoSnapshot(); }