summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README2
-rw-r--r--action.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index 96c302c..7a0b1f0 100644
--- a/README
+++ b/README
@@ -474,4 +474,4 @@ Changes after Version 1.4 release
interface was specified by name.
- Added PID file (thanx to Joerg)
- Added Callweaver support. (thanx to Kristijan)
-
+- Bugfix on timeout rules. (thanx to Benjamin)
diff --git a/action.cpp b/action.cpp
index 5819670..080e8f6 100644
--- a/action.cpp
+++ b/action.cpp
@@ -2227,7 +2227,7 @@ void EndpointAppPBX::process_dialing(void)
//PDEBUG(~0, "HANG-BUG-DEBUGGING: before action-timeout processing\n");
/* process timeout */
- if (e_action_timeout)
+ if (e_action && e_action_timeout) /* e_action may be NULL, but e_action_timeout may still be set and must be ignored */
{
e_action_timeout = 0;
if (e_state == EPOINT_STATE_CONNECT)