Changeset 70fa2dae for launchers/macosx


Ignore:
Timestamp:
Sep 20, 2018 3:27:37 AM (23 months ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
4369b7d
Parents:
85ebb2f
Message:

Mac OS X Launcher: Let version detection etc happen even a router is already started.

Location:
launchers/macosx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • launchers/macosx/I2PLauncher.xcodeproj/project.pbxproj

    r85ebb2f r70fa2dae  
    5454                BF1EFA39215140E60014EB07 /* SBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SBridge.mm; sourceTree = SOURCE_ROOT; };
    5555                BF1EFA3B215141100014EB07 /* RouterTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RouterTask.h; sourceTree = SOURCE_ROOT; };
    56                 BF1EFA3C215141100014EB07 /* JavaHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaHelper.h; sourceTree = SOURCE_ROOT; };
    5756                BF1EFA3D215141100014EB07 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = SOURCE_ROOT; };
    5857                BF1EFA3E215141100014EB07 /* RouterTask.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RouterTask.mm; sourceTree = SOURCE_ROOT; };
     
    169168                                BF1EFA42215141220014EB07 /* include */,
    170169                                BF1EFA3F215141110014EB07 /* AppDelegate.h */,
    171                                 BF1EFA3C215141100014EB07 /* JavaHelper.h */,
    172170                                BF1EFA3D215141100014EB07 /* main.mm */,
    173171                                BF1EFA3B215141100014EB07 /* RouterTask.h */,
     
    260258                                        BF5061672113C48E0014EB07 = {
    261259                                                CreatedOnToolsVersion = 9.4.1;
    262                                                 DevelopmentTeam = DTX4Q6WZN2;
     260                                                DevelopmentTeam = W3C42P2LA8;
    263261                                                LastSwiftMigration = 0940;
    264262                                                ProvisioningStyle = Automatic;
     
    497495                                DEAD_CODE_STRIPPING = YES;
    498496                                DEFINES_MODULE = YES;
    499                                 DEVELOPMENT_TEAM = DTX4Q6WZN2;
     497                                DEVELOPMENT_TEAM = W3C42P2LA8;
    500498                                FRAMEWORK_SEARCH_PATHS = (
    501499                                        /Library/Frameworks,
     
    533531                                DEAD_CODE_STRIPPING = YES;
    534532                                DEFINES_MODULE = YES;
    535                                 DEVELOPMENT_TEAM = DTX4Q6WZN2;
     533                                DEVELOPMENT_TEAM = W3C42P2LA8;
    536534                                FRAMEWORK_SEARCH_PATHS = (
    537535                                        /Library/Frameworks,
  • launchers/macosx/main.mm

    r85ebb2f r70fa2dae  
    196196    [routerStatus setRouterStatus: true];
    197197    [routerStatus setRouterRanByUs: false];
    198     return;
     198    shouldAutoStartRouter = false;
    199199  } else {
    200200    shouldAutoStartRouter = true;
Note: See TracChangeset for help on using the changeset viewer.