mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-04 05:50:31 -05:00 
			
		
		
		
	Somehow the relative positions of readSettings() and the "kllbyname"
block got inverted, preventing multiple instances from working. It's fixed now. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3562 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
		
							parent
							
								
									9021a34288
								
							
						
					
					
						commit
						babb07cce0
					
				@ -274,10 +274,14 @@ MainWindow::MainWindow(QSettings * settings, QSharedMemory *shdmem, QString *the
 | 
				
			|||||||
// Multiple instances:
 | 
					// Multiple instances:
 | 
				
			||||||
  mykey_jt9 = thekey;
 | 
					  mykey_jt9 = thekey;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  //Band Settings
 | 
				
			||||||
 | 
					  readSettings();		         //Restore user's setup params
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef WIN32
 | 
					#ifdef WIN32
 | 
				
			||||||
  if(!m_bMultipleOK) {
 | 
					  if(!m_bMultipleOK) {
 | 
				
			||||||
    while(true) {
 | 
					    while(true) {
 | 
				
			||||||
      int iret=killbyname("jt9.exe");
 | 
					      int iret=killbyname("jt9.exe");
 | 
				
			||||||
 | 
					      qDebug() << m_bMultipleOK << iret;
 | 
				
			||||||
      if(iret == 603) break;
 | 
					      if(iret == 603) break;
 | 
				
			||||||
      if(iret != 0) msgBox("KillByName return code: " +
 | 
					      if(iret != 0) msgBox("KillByName return code: " +
 | 
				
			||||||
                           QString::number(iret));
 | 
					                           QString::number(iret));
 | 
				
			||||||
@ -285,8 +289,6 @@ MainWindow::MainWindow(QSettings * settings, QSharedMemory *shdmem, QString *the
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  //Band Settings
 | 
					 | 
				
			||||||
  readSettings();		         //Restore user's setup params
 | 
					 | 
				
			||||||
  if(m_dFreq.length()<=1) {      //Use the startup default frequencies and band descriptions
 | 
					  if(m_dFreq.length()<=1) {      //Use the startup default frequencies and band descriptions
 | 
				
			||||||
    // default bands and JT65 frequencies
 | 
					    // default bands and JT65 frequencies
 | 
				
			||||||
    const double dFreq[]={0.13613,0.4742,1.838,3.576,5.357,7.076,10.138,14.076,
 | 
					    const double dFreq[]={0.13613,0.4742,1.838,3.576,5.357,7.076,10.138,14.076,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user