убран сигфол в хэдлесс режиме

in-league-with-satan · Dec 2, 2019 · 81eff75 · 81eff75
1 parent 653d0bc
commit 81eff75
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/capturer/src/mainwindow.cpp b/capturer/src/mainwindow.cpp
@@ -124,7 +124,9 @@ MainWindow::MainWindow(QObject *parent)
         //
 
         connect(encoder_streaming, SIGNAL(errorString(QString)), messenger, SIGNAL(errorString(QString)), Qt::QueuedConnection);
-        connect(encoder_streaming, SIGNAL(stats(FFEncoder::Stats)), term, SLOT(updateStats(FFEncoder::Stats)), Qt::QueuedConnection);
+
+        if(term)
+            connect(encoder_streaming, SIGNAL(stats(FFEncoder::Stats)), term, SLOT(updateStats(FFEncoder::Stats)), Qt::QueuedConnection);
 
         //
 
@@ -2249,7 +2251,9 @@ void MainWindow::settingsModelDataChanged(int index, int role, bool qml)
 
     if(!qml) {
         settings_model->updateQml();
-        messenger->focusReset();
+
+        if(messenger)
+            messenger->focusReset();
     }
 }
 

diff --git a/capturer/src/mainwindow.h b/capturer/src/mainwindow.h
@@ -63,21 +63,21 @@ class MainWindow : public QObject
 
     QList <ObjGrp> stream;
 
-    SettingsModel *settings_model;
+    SettingsModel *settings_model=nullptr;
 
-    FFDecoderThread *ff_dec;
+    FFDecoderThread *ff_dec=nullptr;
 
-    QmlMessenger *messenger;
-    OverlayView *overlay_view;
+    QmlMessenger *messenger=nullptr;
+    OverlayView *overlay_view=nullptr;
 
-    AudioLevel *audio_level_primary;
-    AudioLevel *audio_level_secondary;
+    AudioLevel *audio_level_primary=nullptr;
+    AudioLevel *audio_level_secondary=nullptr;
 
-    AudioOutputInterface *audio_output;
+    AudioOutputInterface *audio_output=nullptr;
 
-    HttpServer *http_server;
+    HttpServer *http_server=nullptr;
 
-    NvTools *nv_tools;
+    NvTools *nv_tools=nullptr;
     QStringList cuda_devices;
 
     FFEncoderBaseFilename enc_streaming_url;