resolved merge conflicts

2021-01-15 17:58:43 -06:00
parent 92b9379d69 7f55d0c672
commit 9581a698af
12 changed files with 165 additions and 85 deletions
--- a/src/widgets/capture/capturewidget.cpp
+++ b/src/widgets/capture/capturewidget.cpp
@@ -1200,9 +1200,10 @@ void CaptureWidget::saveScreenshot()
    }
    hide();
    if (m_context.savePath.isEmpty()) {
-        ScreenshotSaver().saveToFilesystemGUI(pixmap());
+        ScreenshotSaver(m_id).saveToFilesystemGUI(pixmap());
    } else {
-        ScreenshotSaver().saveToFilesystem(pixmap(), m_context.savePath, "");
+        ScreenshotSaver(m_id).saveToFilesystem(
+          pixmap(), m_context.savePath, "");
    }
    close();
 }