[med-svn] [SCM] aghermann branch, master, updated. c0bd21ca8eb529ade7e0c7aad22951a308a8dc8f

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 705681c5f7d21fa7967d491968ca75c8a1fd5fa0
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Apr 30 01:58:54 2013 +0300

    SChannel::figure_type_and_name() does not return TType::invalid

diff --git a/src/libsigfile/channel.hh b/src/libsigfile/channel.hh
index d8f8482..0f61cd0 100644
--- a/src/libsigfile/channel.hh
+++ b/src/libsigfile/channel.hh
@@ -120,11 +120,8 @@ struct SChannel {
 	SChannel (const string& h)
 		{
 			tie(_type, _idx) = figure_type_and_name(h);
-			if ( _type == TType::invalid ) {
-				_type = TType::other;
-				_idx = 0; // custom
+			if ( _idx == 0 )
 				_custom_name = h;
-			}
 		}
 
 	SChannel (TType type_, int idx_)

-- 
Sleep experiment manager