X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=f95cd45123eb1345f56a65160ed7b6268d3b7d18;hb=92b139d0889951e1bb90ee0803bdc6999fdf48b0;hp=66bed74896ae4f8edf7e3327999dd6b0f6de97bb;hpb=d52d8455db515a779b4451c223ba7aaded70951a;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 66bed748..f95cd451 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -152,6 +152,7 @@ void MainWindow::setup_ui()
 	_action_view_show_cursors = new QAction(this);
 	_action_view_show_cursors->setCheckable(true);
 	_action_view_show_cursors->setChecked(_view->cursors_shown());
+	_action_view_show_cursors->setShortcut(QKeySequence(Qt::Key_C));
 	_action_view_show_cursors->setObjectName(
 		QString::fromUtf8("actionViewShowCursors"));
 	_action_view_show_cursors->setText(QApplication::translate(
@@ -250,7 +251,8 @@ void MainWindow::on_actionOpen_triggered()
 	const QString file_name = QFileDialog::getOpenFileName(
 		this, tr("Open File"), "",
 		tr("Sigrok Sessions (*.sr)"));
-	load_file(file_name);
+	if (!file_name.isEmpty())
+		load_file(file_name);
 }
 
 void MainWindow::on_actionConnect_triggered()
@@ -287,7 +289,12 @@ void MainWindow::on_actionViewZoomOut_triggered()
 void MainWindow::on_actionViewShowCursors_triggered()
 {
 	assert(_view);
-	_view->show_cursors(_action_view_show_cursors->isChecked());
+
+	const bool show = !_view->cursors_shown();
+	if(show)
+		_view->centre_cursors();
+
+	_view->show_cursors(show);
 }
 
 void MainWindow::on_actionAbout_triggered()
@@ -300,9 +307,8 @@ void MainWindow::run_stop()
 {
 	switch(_session.get_capture_state()) {
 	case SigSession::Stopped:
-		_session.start_capture(
-			_sampling_bar->get_selected_device(),
-			_sampling_bar->get_record_length(),
+		_session.set_device(_sampling_bar->get_selected_device());
+		_session.start_capture(_sampling_bar->get_record_length(),
 			boost::bind(&MainWindow::session_error, this,
 				QString("Capture failed"), _1));
 		break;