2 files changed, 16 insertions, 4 deletions

diff --git a/src/Lang/Cpp/CppDocGen.ts b/src/Lang/Cpp/CppDocGen.ts
index bc9f09a..ace05c2 100644
--- a/src/Lang/Cpp/CppDocGen.ts
+++ b/src/Lang/Cpp/CppDocGen.ts
@@ -264,9 +264,6 @@ export class CppDocGen implements IDocGen {
     }
 
     protected generateReturnParams(): string[] {
-        if (this.cfg.Generic.includeTypeAtReturn === false) {
-            return [""];
-        }
 
         const params: string[] = [];
 
@@ -289,6 +286,13 @@ export class CppDocGen implements IDocGen {
             params.push(this.cfg.Generic.includeTypeAtReturn === true ? this.func.type.Yield() : "");
         } else if (voidReturnIndex === -1 && this.func.type.nodes.length > 0) {
             params.push(this.cfg.Generic.includeTypeAtReturn === true ? this.func.type.Yield() : "");
+        } else {
+            if (this.cfg.Generic.includeTypeAtReturn === false) {
+                return [];
+            }
+        }
+        if (this.cfg.Generic.includeTypeAtReturn === false) {
+            return [""];
         }
 
         return params;
diff --git a/src/test/CppTests/Config.test.ts b/src/test/CppTests/Config.test.ts
index f39b7d3..ec52c61 100644
--- a/src/test/CppTests/Config.test.ts
+++ b/src/test/CppTests/Config.test.ts
@@ -65,7 +65,7 @@ suite("C++ - Configuration Tests", () => {
             + " * @return bool \n */", result);
     });
 
-    test("Disable including return type.", () => {
+    test("Disable including return type on function", () => {
         testSetup.cfg = new Config();
         testSetup.cfg.Generic.includeTypeAtReturn = false;
 
@@ -74,6 +74,14 @@ suite("C++ - Configuration Tests", () => {
             + " * @return  \n */", result);
     });
 
+    test("Disable including return type on non-function", () => {
+        testSetup.cfg = new Config();
+        testSetup.cfg.Generic.includeTypeAtReturn = false;
+
+        const result = testSetup.SetLine("bool b;").GetResult();
+        assert.strictEqual("/**\n * @brief \n * \n */", result);
+    });
+
     test("Newlines after params and tparams but not after brief", () => {
         testSetup.cfg = new Config();
         testSetup.cfg.Generic.order = ["brief", "tparam", "empty", "param", "empty", "return"];