diff --git a/src/app/main.cpp b/src/app/main.cpp index 7f02ec67b..5ab06e28b 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #if defined(Q_OS_UNIX) #include @@ -210,9 +211,7 @@ int main(int argc, char *argv[]) throw CommandLineParameterError(QObject::tr("You cannot use %1: qBittorrent is already running for this user.") .arg(u"-d (or --daemon)"_qs)); } - else #endif - qDebug("qBittorrent is already running for this user."); QThread::msleep(300); app->sendParams(params.paramList()); @@ -318,17 +317,13 @@ int main(int argc, char *argv[]) void reportToUser(const char *str) { const size_t strLen = strlen(str); -#ifndef Q_OS_WIN - if (write(STDERR_FILENO, str, strLen) < static_cast(strLen)) - { - const auto dummy = write(STDOUT_FILENO, str, strLen); +#ifdef Q_OS_WIN + if (_write(_fileno(stderr), str, strLen) < static_cast(strLen)) + std::ignore = _write(_fileno(stdout), str, strLen); #else - if (_write(STDERR_FILENO, str, strLen) < static_cast(strLen)) - { - const auto dummy = _write(STDOUT_FILENO, str, strLen); + if (write(STDERR_FILENO, str, strLen) < static_cast(strLen)) + std::ignore = write(STDOUT_FILENO, str, strLen); #endif - Q_UNUSED(dummy); - } } #endif @@ -357,8 +352,10 @@ void sigAbnormalHandler(int signum) reportToUser(msg); reportToUser(sigName); reportToUser("\n"); +#if !defined Q_OS_WIN print_stacktrace(); // unsafe #endif +#endif #if defined Q_OS_WIN && !defined DISABLE_GUI StacktraceDialog dlg; // unsafe