merge with dev

2019-02-20 08:05:33 +01:00
parent 613784af90 b37f545391
commit 1b038ad338
5 changed files with 36 additions and 18 deletions
--- a/rtgui/bayerprocess.cc
+++ b/rtgui/bayerprocess.cc
@@ -730,7 +730,10 @@ void BayerProcess::FrameCountChanged(int n, int frameNum)
                entry << i;
                imageNumber->append(entry.str());
            }
-            imageNumber->set_active(std::min(frameNum, n - 1));
+            if (n == 2) {
+                imageNumber->append(M("TP_RAW_IMAGENUM_SN"));
+            }
+            imageNumber->set_active(std::min(frameNum, n == 2 ? n : n - 1));
            if (n == 1) {
                imageNumberBox->hide();
            } else {