Fix the display of the transition names again.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9bac15a822c46d46d830a9047221144b0b8dbe69..cfc15699261b04ef3b9edb9847fd3b1780279e39 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -75,7 +75,7 @@ MainWindow::MainWindow()
        transition_btn3 = ui->transition_btn3;
        qRegisterMetaType<string>("std::string");
        qRegisterMetaType<vector<string>>("std::vector<std::string>");
-       connect(ui->me_preview, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names);
+       connect(ui->me_live, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names);
        qRegisterMetaType<Mixer::Output>("Mixer::Output");
 }
 
@@ -154,12 +154,14 @@ void MainWindow::mixer_created(Mixer *mixer)
        mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8));
 
        struct sigaction act;
+       memset(&act, 0, sizeof(act));
        act.sa_handler = schedule_cut_signal;
        act.sa_flags = SA_RESTART;
        sigaction(SIGHUP, &act, nullptr);
 
        // Mostly for debugging. Don't override SIGINT, that's so evil if
        // shutdown isn't instant.
+       memset(&act, 0, sizeof(act));
        act.sa_handler = quit_signal;
        act.sa_flags = SA_RESTART;
        sigaction(SIGUSR1, &act, nullptr);