Merge branch 'charlesmchen/fixCFail'

8 years ago · 4609c508ec
parent 4eacfe768f 30961cf2a5
commit 4609c508ec
1 changed files with 5 additions and 6 deletions
--- a/src/Util/Asserts.h
+++ b/src/Util/Asserts.h
@ -40,12 +40,11 @@
 #define OWSCFail(message, ...)                                                                                         \
    {                                                                                                                  \
-        if (!(X)) {                                                                                                    \
+        NSString *formattedMessage = [NSString stringWithFormat:message, ##__VA_ARGS__];                               \
-            NSString *formattedMessage = [NSString stringWithFormat:message, ##__VA_ARGS__];                           \
+        DDLogError(@"%s %@", __PRETTY_FUNCTION__, formattedMessage);                                                   \
-            DDLogError(@"%s %@", __PRETTY_FUNCTION__, formattedMessage);                                               \
+        [DDLog flushLog];                                                                                              \
-            [DDLog flushLog];                                                                                          \
+        NSCAssert(0, formattedMessage);                                                                                \
-            NSCAssert(0, formattedMessage);                                                                            \
+    }
        }
 #else