From 27373d4f2c999d3ba377835f8832894f8584dbab Mon Sep 17 00:00:00 2001
From: Eirik Byrkjeflot Anonsen <eirik@eirikba.org>
Date: Mon, 4 Apr 2016 19:05:27 +0200
Subject: [PATCH] refactor: Clean up addReporter()

---
 include/reporters/catch_reporter_multi.hpp | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/include/reporters/catch_reporter_multi.hpp b/include/reporters/catch_reporter_multi.hpp
index 9023a3f1..2ffdd751 100644
--- a/include/reporters/catch_reporter_multi.hpp
+++ b/include/reporters/catch_reporter_multi.hpp
@@ -128,23 +128,18 @@ public: // IStreamingReporter
 };
 
 Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingReporter, Ptr<IStreamingReporter> const& additionalReporter ) {
-    Ptr<IStreamingReporter> resultingReporter;
+    if( !existingReporter )
+        return additionalReporter;
 
-    if( existingReporter ) {
-        if( !existingReporter->supportsChainedReporters() ) {
-            MultipleReporters* multi = new MultipleReporters;
-            resultingReporter = Ptr<IStreamingReporter>( multi );
-            if( existingReporter )
-                multi->addChainedReporter( existingReporter );
-        }
-        else
-            resultingReporter = existingReporter;
-        resultingReporter->addChainedReporter( additionalReporter );
+    if( existingReporter->supportsChainedReporters() ) {
+        existingReporter->addChainedReporter( additionalReporter );
+        return existingReporter;
     }
-    else
-        resultingReporter = additionalReporter;
 
-    return resultingReporter;
+    Ptr<MultipleReporters> multi = Ptr<MultipleReporters>( new MultipleReporters );
+    multi->addChainedReporter( existingReporter );
+    multi->addChainedReporter( additionalReporter );
+    return Ptr<IStreamingReporter>( multi.get() );
 }