More fixes.

diff --git a/icinga/nagioschecktask.cpp b/icinga/nagioschecktask.cpp
index 97fb586772005981521244cfda3d0d9e346e2bba..ceb0fdcf75b8691db1f65272c5183ae6bc868a0d 100644 (file)
--- a/icinga/nagioschecktask.cpp
+++ b/icinga/nagioschecktask.cpp
@@ -77,7 +77,9 @@ void NagiosCheckTask::CheckThreadProc(void)
 
                                if (!it->second->RunTask()) {
                                        CheckTask::FinishTask(it->second);
-                                       it = tasks.erase(it);
+                                       prev = it;
+                                       it++;
+                                       tasks.erase(prev);
                                } else {
                                        it++;
                                }
@@ -138,7 +140,7 @@ bool NagiosCheckTask::RunTask(void)
        status = _pclose(m_FP);
 #else /* _MSC_VER */
        if (m_UsePopen)
-               status = pclose(fp);
+               status = pclose(m_FP);
        else
                status = pclose_noshell(&m_PCloseArg);
 #endif /* _MSC_VER */

diff --git a/icinga/nagioschecktask.h b/icinga/nagioschecktask.h
index ef46d079fc0a421c10a16933bc4675f6f0eaec92..ee4ca9fcc7cd7f4ba7cdedd4c98909beb72cc111 100644 (file)
--- a/icinga/nagioschecktask.h
+++ b/icinga/nagioschecktask.h
@@ -27,7 +27,9 @@ private:
        FILE *m_FP;
        stringstream m_OutputStream;
        bool m_UsePopen;
+#ifndef _MSC_VER
        popen_noshell_pass_to_pclose m_PCloseArg;
+#endif /* _MSC_VER */
 
        static boost::mutex m_Mutex;
        static deque<NagiosCheckTask::Ptr> m_Tasks;