2 files changed, 3 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 739fc37..dde864f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -102,6 +102,8 @@ ____-__-__: Version 1.3
 - Fixed width and height of the selected parts of the replay progress bar,
   so that its fully compatible with the replay progress bar of the standard
   skins (closes #158)
+- Fixed segmentation fault with token ChannelSource (closes #159 - thanks to
+  a.g.prosat at tochka.ru for reporting this)
 
 2009-06-01: Version 1.2
 
diff --git a/display.c b/display.c
index c8fa7d3..c768db4 100644
--- a/display.c
+++ b/display.c
@@ -140,7 +140,7 @@ cxType cText2SkinDisplayChannel::GetTokenData(const txToken &Token)
 		       : (cxType)false;
 
 	case tChannelSource:
-		return mChannel != NULL
+		return mChannel != NULL && Sources.Get(mChannel->Source()) != NULL
 		       ? (cxType)Sources.Get(mChannel->Source())->Description()
 		       : (cxType)false;