From d1757b5e8a7a6fd9d31e6d916f37f92e4713acf2 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Tue, 20 Nov 2012 19:33:40 +0000
Subject: [PATCH] Minor stuff.

---
 .../juce_events/messages/juce_MessageListener.cpp    |  3 +--
 modules/juce_events/messages/juce_MessageManager.cpp |  3 +--
 .../juce_events/native/juce_mac_MessageManager.mm    | 12 +++---------
 modules/juce_opengl/opengl/juce_OpenGLContext.cpp    |  3 ++-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/modules/juce_events/messages/juce_MessageListener.cpp b/modules/juce_events/messages/juce_MessageListener.cpp
index 5c21e42ccf..a8417e8b58 100644
--- a/modules/juce_events/messages/juce_MessageListener.cpp
+++ b/modules/juce_events/messages/juce_MessageListener.cpp
@@ -28,8 +28,7 @@ Message::~Message() {}
 
 void Message::messageCallback()
 {
-    MessageListener* const r = recipient;
-    if (r != nullptr)
+    if (MessageListener* const r = recipient)
         r->handleMessage (*this);
 }
 
diff --git a/modules/juce_events/messages/juce_MessageManager.cpp b/modules/juce_events/messages/juce_MessageManager.cpp
index 74c4163728..71ca88b895 100644
--- a/modules/juce_events/messages/juce_MessageManager.cpp
+++ b/modules/juce_events/messages/juce_MessageManager.cpp
@@ -30,8 +30,7 @@ public:
 
     void messageCallback()
     {
-        MessageManager* const mm = MessageManager::instance;
-        if (mm != nullptr)
+        if (MessageManager* const mm = MessageManager::instance)
             mm->quitMessageReceived = true;
     }
 
diff --git a/modules/juce_events/native/juce_mac_MessageManager.mm b/modules/juce_events/native/juce_mac_MessageManager.mm
index be061fc184..570bf64f57 100644
--- a/modules/juce_events/native/juce_mac_MessageManager.mm
+++ b/modules/juce_events/native/juce_mac_MessageManager.mm
@@ -122,9 +122,7 @@ private:
     private:
         static NSApplicationTerminateReply applicationShouldTerminate (id /*self*/, SEL, NSApplication*)
         {
-            JUCEApplicationBase* const app = JUCEApplicationBase::getInstance();
-
-            if (app != nullptr)
+            if (JUCEApplicationBase* const app = JUCEApplicationBase::getInstance())
             {
                 app->systemRequestedQuit();
 
@@ -142,9 +140,7 @@ private:
 
         static BOOL application_openFile (id /*self*/, SEL, NSApplication*, NSString* filename)
         {
-            JUCEApplicationBase* const app = JUCEApplicationBase::getInstance();
-
-            if (app != nullptr)
+            if (JUCEApplicationBase* const app = JUCEApplicationBase::getInstance())
             {
                 app->anotherInstanceStarted (quotedIfContainsSpaces (filename));
                 return YES;
@@ -155,9 +151,7 @@ private:
 
         static void application_openFiles (id /*self*/, SEL, NSApplication*, NSArray* filenames)
         {
-            JUCEApplicationBase* const app = JUCEApplicationBase::getInstance();
-
-            if (app != nullptr)
+            if (JUCEApplicationBase* const app = JUCEApplicationBase::getInstance())
             {
                 StringArray files;
                 for (unsigned int i = 0; i < [filenames count]; ++i)
diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp
index 5aa4619c9a..503b4e86b9 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp
@@ -142,6 +142,7 @@ public:
     bool renderFrame()
     {
         ScopedPointer<MessageManagerLock> mmLock;
+
         if (context.renderComponents && needsUpdate)
         {
             mmLock = new MessageManagerLock (this);  // need to acquire this before locking the context.
@@ -332,7 +333,7 @@ public:
         const int defaultFPS = 60;
 
         const int elapsed = (int) (Time::getMillisecondCounter() - frameRenderStartTime);
-        wait (jmax (1, (1000 / defaultFPS) - elapsed));
+        wait (jmax (1, (1000 / defaultFPS - 1) - elapsed));
     }
 
     //==============================================================================