Merge branch 'JFreegman-avcancel'

irungentoo · irungentoo · commit 2231cd43d0a8 · 2014-06-23T22:57:23.000-04:00
diff --git a/toxav/toxav.c b/toxav/toxav.c
@@ -262,6 +262,10 @@ int toxav_cancel ( ToxAv *av, int32_t call_index, int peer_id, const char *reaso
         return ErrorNoCall;
     }
 
+    if ( av->msi_session->calls[call_index]->state != call_inviting ) {
+        return ErrorInvalidState;
+    }
+
     return msi_cancel(av->msi_session, call_index, peer_id, reason);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,10 @@ int toxav_cancel ( ToxAv av, int32_t call_index, int peer_id, const char reaso`
`262`	`262`	`return ErrorNoCall;`
`263`	`263`	`}`
`264`	`264`
	`265`	`+ if ( av->msi_session->calls[call_index]->state != call_inviting ) {`
	`266`	`+ return ErrorInvalidState;`
	`267`	`+ }`
	`268`	`+`
`265`	`269`	`return msi_cancel(av->msi_session, call_index, peer_id, reason);`
`266`	`270`	`}`
`267`	`271`