Merge branch 'csaba/nan'

[flightgear.git] / src / Sound / morse.cxx

diff --git a/src/Sound/morse.cxx b/src/Sound/morse.cxx
index 942b637a5a2ae46ecf1687994fdd2e82983ce386..df6c969face529f7572d3e55f9f15c59af5b3f7a 100644 (file)
--- a/src/Sound/morse.cxx
+++ b/src/Sound/morse.cxx
@@ -193,7 +193,7 @@ SGSoundSample *FGMorse::make_ident( const string& id, const int freq ) {
     for ( i = 0; i < (int)id.length(); ++i ) {
        if ( idptr[i] >= 'A' && idptr[i] <= 'Z' ) {
            int c = (int)(idptr[i] - 'A');
-           for ( j = 0; j < 4 || alphabet[c][j] == end; ++j ) {
+           for ( j = 0; j < 4 && alphabet[c][j] != end; ++j ) {
                if ( alphabet[c][j] == DIT ) {
                    length += DIT_SIZE;
                } else if ( alphabet[c][j] == DAH ) {
@@ -227,7 +227,7 @@ SGSoundSample *FGMorse::make_ident( const string& id, const int freq ) {
     for ( i = 0; i < (int)id.length(); ++i ) {
        if ( idptr[i] >= 'A' && idptr[i] <= 'Z' ) {
            int c = (int)(idptr[i] - 'A');
-           for ( j = 0; j < 4 || alphabet[c][j] == end; ++j ) {
+           for ( j = 0; j < 4 && alphabet[c][j] != end; ++j ) {
                if ( alphabet[c][j] == DIT ) {
                    memcpy( buf_ptr, dit_ptr, DIT_SIZE );
                    buf_ptr += DIT_SIZE;