Merge with branch1.2

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 92ebf8bc..a048d50d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -149,7 +149,7 @@ bool isNxmLink(const QString &link)
   return link.left(6).toLower() == "nxm://";

 }

 

-LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *exceptionPtrs)

+static LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *exceptionPtrs)

 {

   typedef BOOL (WINAPI *FuncMiniDumpWriteDump)(HANDLE process, DWORD pid, HANDLE file, MINIDUMP_TYPE dumpType,

                                                const PMINIDUMP_EXCEPTION_INFORMATION exceptionParam,

@@ -211,12 +211,12 @@ LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *exceptionPtrs
   return result;

 }

 

-void registerMetaTypes()

+static void registerMetaTypes()

 {

   registerExecutable();

 }

 

-bool HaveWriteAccess(const std::wstring &path)

+static bool HaveWriteAccess(const std::wstring &path)

 {

   bool writable = false;