Version 0.2.0 from FTP

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@515 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 4 deletions

diff --git a/file.c b/file.c
index 2fa223e69..7ac47aa5c 100755
--- a/file.c
+++ b/file.c
@@ -184,9 +184,12 @@ int ast_writestream(struct ast_filestream *fs, struct ast_frame *f)
 			res = 0;
 			/* Get the translated frame but don't consume the original in case they're using it on another stream */
 			trf = ast_translate(fs->trans, f, 0);
-			res = fs->fmt->write(fs, trf);
-			if (res) 
-				ast_log(LOG_WARNING, "Translated frame write failed\n");
+			if (trf) {
+				res = fs->fmt->write(fs, trf);
+				if (res) 
+					ast_log(LOG_WARNING, "Translated frame write failed\n");
+			} else
+				res = 0;
 		}
 		return res;
 	}
@@ -547,6 +550,6 @@ char ast_waitstream(struct ast_channel *c, char *breakon)
 	
 		
 	}
-	return (c->softhangup ? -1 : 0);
+	return (c->_softhangup ? -1 : 0);
 }