fix demo server not being added if serverlist.txt is absent
This commit is contained in:
		
							parent
							
								
									db36bbd427
								
							
						
					
					
						commit
						6b267e8fdc
					
				@ -243,10 +243,7 @@ QVector<server_type> AOApplication::read_serverlist_txt()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  serverlist_txt.setFileName(serverlist_txt_path);
 | 
					  serverlist_txt.setFileName(serverlist_txt_path);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (!serverlist_txt.open(QIODevice::ReadOnly)) {
 | 
					  if (serverlist_txt.open(QIODevice::ReadOnly)) {
 | 
				
			||||||
    return f_server_list;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      QTextStream in(&serverlist_txt);
 | 
					      QTextStream in(&serverlist_txt);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      while (!in.atEnd()) {
 | 
					      while (!in.atEnd()) {
 | 
				
			||||||
@ -264,12 +261,13 @@ QVector<server_type> AOApplication::read_serverlist_txt()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        f_server_list.append(f_server);
 | 
					        f_server_list.append(f_server);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  server_type demo_server;
 | 
					  server_type demo_server;
 | 
				
			||||||
  demo_server.ip = "127.0.0.1";
 | 
					  demo_server.ip = "127.0.0.1";
 | 
				
			||||||
  demo_server.port = 99999;
 | 
					  demo_server.port = 99999;
 | 
				
			||||||
  demo_server.name = "Demo playback";
 | 
					  demo_server.name = tr("Demo playback");
 | 
				
			||||||
  demo_server.desc = "Play back demos you have previously recorded";
 | 
					  demo_server.desc = tr("Play back demos you have previously recorded");
 | 
				
			||||||
  f_server_list.append(demo_server);
 | 
					  f_server_list.append(demo_server);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  return f_server_list;
 | 
					  return f_server_list;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user