Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,16 @@ static bool CheckFFmpegEnv()
static void handleSignal(int sig)
{
qWarning() << "Received signal:" << sig;
exit(0);
// 在HW机器、SW机器上,发现使用exit(0)退出会导致Qt某些函数空指针异常,从而导致崩溃,疑似在资源回收环节出了问题。所以我们使用QApplication::quit()更优雅地退出。
QTimer::singleShot(0, qApp, []() {
QApplication::quit();
});
//exit(0);
}

int main(int argc, char *argv[])
{
qInfo() << "Starting deepin-camera application...";
// 注册信号处理函数
signal(SIGTERM, handleSignal); // kill默认发送的信号

// Task 326583 不参与合成器崩溃重连
unsetenv("QT_WAYLAND_RECONNECT");

Expand Down Expand Up @@ -250,6 +251,9 @@ int main(int argc, char *argv[])
qDebug() << "LUT_DIR: " << lutDir;
qDebug() << QString("Filter initialization completed in %1 ms").arg(time.elapsed());
CApplication a(argc, argv);
// 注册信号处理函数
// 放在此处,是为了确保Application已经创建了实例
signal(SIGTERM, handleSignal); // kill默认发送的信号

qApp->setObjectName("deepin-camera");
#ifndef __mips__
Expand Down