chatterino2
Code Issues

fix: improve error messaging when pgrep fails streamer mode detection (#5321)

Browse Source 
When launching pgrep times out, a timeout message is now posted instead of the default "pgrep is not installed" error.
This commit is contained in:
pajlada
2024-04-13 09:01:20 +02:00
committed by GitHub
parent f4e950ea0b
commit bf8266e9b3
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/singletons/StreamerMode.cpp
+39 -10
View File
@@ -51,6 +51,9 @@ const QStringList &broadcastingBinaries()
bool isBroadcasterSoftwareActive()
{
#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
static bool shouldShowTimeoutWarning = true;
static bool shouldShowWarning = true;
QProcess p;
p.start("pgrep", {"-xi", broadcastingBinaries().join("|")},
QIODevice::NotOpen);
@@ -62,20 +65,46 @@ bool isBroadcasterSoftwareActive()
// Fallback to false and showing a warning
static bool shouldShowWarning = true;
if (shouldShowWarning)
switch (p.error())
{
shouldShowWarning = false;
case QProcess::Timedout: {
qCWarning(chatterinoStreamerMode) << "pgrep execution timed out!";
if (shouldShowTimeoutWarning)
{
shouldShowTimeoutWarning = false;
postToThread([] {
getApp()->twitch->addGlobalSystemMessage(
"Streamer Mode is set to Automatic, but pgrep is missing. "
"Install it to fix the issue or set Streamer Mode to "
"Enabled or Disabled in the Settings.");
});
postToThread([] {
getApp()->twitch->addGlobalSystemMessage(
"Streamer Mode is set to Automatic, but pgrep timed "
"out. This can happen if your system lagged at the "
"wrong moment. If Streamer Mode continues to not work, "
"you can manually set it to Enabled or Disabled in the "
"Settings.");
});
}
}
break;
default: {
qCWarning(chatterinoStreamerMode)
<< "pgrep execution failed:" << p.error();
if (shouldShowWarning)
{
shouldShowWarning = false;
postToThread([] {
getApp()->twitch->addGlobalSystemMessage(
"Streamer Mode is set to Automatic, but pgrep is "
"missing. "
"Install it to fix the issue or set Streamer Mode to "
"Enabled or Disabled in the Settings.");
});
}
}
break;
}
qCWarning(chatterinoStreamerMode) << "pgrep execution timed out!";
return false;
#elif defined(Q_OS_WIN)
if (!IsWindowsVistaOrGreater())