quickshell/quickshell
1
1
Fork 2
Code Issues Releases Wiki Activity

Compare commits

base: quickshell:ffa9d02d483573e2c4157bd79c12ecbc9b6691f2
Branches Tags
quickshell:master
...
compare: quickshell:b42add39670e4b60f36a2b445a87c1fdc5ebb0c2
Branches Tags
quickshell:master

2 commits
ffa9d02d48 ... b42add3967

Author SHA1 Message Date
outfoxxed b42add3967
fix: Process.pid and Quickshell.env returning undefined instead of null 2024-03-03 15:31:15 -08:00
outfoxxed 087c929871
fix(process): pid not emitting changed signal 2024-03-03 15:30:52 -08:00
2 changed files with 5 additions and 3 deletions
Show stats Expand all files Collapse all files

2
src/core/qmlglobal.cpp
View file

@ -79,7 +79,7 @@ void QuickshellGlobal::updateScreens() {
QVariant QuickshellGlobal::env(const QString& variable) { // NOLINT
auto vstr = variable.toStdString();
if (!qEnvironmentVariableIsSet(vstr.data())) return QVariant();
if (!qEnvironmentVariableIsSet(vstr.data())) return QVariant::fromValue(nullptr);
return qEnvironmentVariable(vstr.data());
}

6
src/io/process.cpp
View file

@ -20,7 +20,7 @@ void Process::setRunning(bool running) {
}
QVariant Process::pid() const {
if (this->process == nullptr) return QVariant();
if (this->process == nullptr) return QVariant::fromValue(nullptr);
return QVariant::fromValue(this->process->processId());
}
@ -141,8 +141,9 @@ void Process::startProcessIfReady() {
}
void Process::onStarted() {
emit this->started();
emit this->pidChanged();
emit this->runningChanged();
emit this->started();
}
void Process::onFinished(qint32 exitCode, QProcess::ExitStatus exitStatus) {
@ -153,6 +154,7 @@ void Process::onFinished(qint32 exitCode, QProcess::ExitStatus exitStatus) {
emit this->exited(exitCode, exitStatus);
emit this->runningChanged();
emit this->pidChanged();
}
void Process::onErrorOccurred(QProcess::ProcessError error) {