X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=3a5ac29fc2bca41ae597f812ee90d88040b2a02f;hp=793f4ce12d77dd83e6b7f976a1a70de29216caf1;hb=852a25198bc051a57179961cb9d7836212a62184;hpb=1f3033cb3e63de7cfe98dab537460443917fece3 diff --git a/main.cpp b/main.cpp index 793f4ce1..3a5ac29f 100644 --- a/main.cpp +++ b/main.cpp @@ -277,7 +277,8 @@ int main(int argc, char *argv[]) qRegisterMetaType("uint64_t"); qRegisterMetaType("util::Timestamp"); - qRegisterMetaType("data::Segment"); + qRegisterMetaType("SharedPtrToSegment"); + qRegisterMetaType>("shared_ptr"); // Prepare the global settings since logging needs them early on pv::GlobalSettings settings; @@ -349,10 +350,9 @@ int main(int argc, char *argv[]) #ifdef ENABLE_SIGNALS if (SignalHandler::prepare_signals()) { SignalHandler *const handler = new SignalHandler(&w); - QObject::connect(handler, SIGNAL(int_received()), - &w, SLOT(close())); - QObject::connect(handler, SIGNAL(term_received()), - &w, SLOT(close())); + QObject::connect(handler, SIGNAL(int_received()), &w, SLOT(close())); + QObject::connect(handler, SIGNAL(term_received()), &w, SLOT(close())); + QObject::connect(handler, SIGNAL(usr1_received()), &w, SLOT(on_run_stop_clicked())); } else qWarning() << "Could not prepare signal handler."; #endif