From 049beba1572638b2b45695dfee3a3e5c5f2b8c86 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 21 Feb 2018 14:15:41 -0800
Subject: [PATCH] Corrected edge case of creating a snapshot with "" as the
 filename.

---
 interface/src/Application.h                        | 3 +--
 interface/src/scripting/WindowScriptingInterface.h | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.h b/interface/src/Application.h
index d4041aa3be..784b509c1a 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -266,9 +266,8 @@ public:
 
     float getGameLoopRate() const { return _gameLoopCounter.rate(); }
 
-    // Note that takeSnapshot has a default value, as this method is used internally.
     void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = QString());
-    void takeSecondaryCameraSnapshot(const QString& filename);
+    void takeSecondaryCameraSnapshot(const QString& filename = QString());
 
     void shareSnapshot(const QString& filename, const QUrl& href = QUrl(""));
 
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 76decf4362..196863e362 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -334,8 +334,8 @@ public slots:
      * @param {number} aspectRatio=0 - The width/height ratio of the snapshot required. If the value is <code>0</code> the
      *     full resolution is used (window dimensions in desktop mode; HMD display dimensions in HMD mode), otherwise one of the
      *     dimensions is adjusted in order to match the aspect ratio.
-     * @param {string} filename=QString() - If this value is not null then the image will be saved to this filename, with an appended ",jpg".
-	 *      otherwise, the image will be saved as 'hifi-snap-by-<user name>-YYYY-MM-DD_HH-MM-SS'
+     * @param {string} filename="" - If this value is not given, or is <code>""</code> then the image will be saved to this filename, with an appended ",jpg".
+	 *      otherwise, the image will be saved as 'hifi-snap-by-<user name>-YYYY-MM-DD_HH-MM-SS'.
      * @example <caption>Using the snapshot function and signals.</caption>
      * function onStillSnapshotTaken(path, notify) {
      *     print("Still snapshot taken: " + path);
@@ -357,7 +357,7 @@ public slots:
      * var notify = true;
      * var animated = true;
      * var aspect = 1920 / 1080;
-     * var filename = QString();
+     * var filename = "";
      * Window.takeSnapshot(notify, animated, aspect, filename);
      */
     void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = QString());
@@ -365,7 +365,7 @@ public slots:
     /**jsdoc
      * Takes a still snapshot of the current view from the secondary camera that can be set up through the {@link Render} API.
      * @function Window.takeSecondaryCameraSnapshot
-     * @param {string} filename=QString() - If this value is not null then the image will be saved to this filename, with an appended ".jpg"
+     * @param {string} filename="" - If this value is not given, or is <code>""</code> then the image will be saved to this filename, with an appended ".jpg".
      *
      * var filename = QString();
      */