From c280a463f3b3c1a0d65ba78e6070074f1e58d7dc Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 8 Jan 2020 16:00:41 +0000
Subject: [PATCH] Fix scoping on some conditional serialises

* The SERIALISE_ELEMENT macro because of deserialisation cannot be single-
  statement-safe.
---
 renderdoc/core/target_control.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/renderdoc/core/target_control.cpp b/renderdoc/core/target_control.cpp
index 66a8b164e..8a448ed1f 100644
--- a/renderdoc/core/target_control.cpp
+++ b/renderdoc/core/target_control.cpp
@@ -225,9 +225,13 @@ void RenderDoc::TargetControlClientThread(uint32_t version, Network::Socket *cli
         SERIALISE_ELEMENT(path);
         SERIALISE_ELEMENT(buf);
         if(version >= 3)
+        {
           SERIALISE_ELEMENT(captures.back().driver);
+        }
         if(version >= 5)
+        {
           SERIALISE_ELEMENT(captures.back().frameNumber);
+        }
       }
     }
     else if(childprocs.size() != children.size())
@@ -740,7 +744,9 @@ public:
         SERIALISE_ELEMENT(msg.newCapture.path).Named("path"_lit);
         SERIALISE_ELEMENT(thumbnail);
         if(m_Version >= 3)
+        {
           SERIALISE_ELEMENT(driver);
+        }
         if(m_Version >= 5)
         {
           SERIALISE_ELEMENT(msg.newCapture.frameNumber);