CC2640R2F: Multi-Role project stops advertising after App connects to it and disconnects

Ok, to clarify. What I am trying to do is. I set maxNumBleConns to 1.

When I connect from my App to the LP. GAP_LINK_ESTABLISHED_EVENT is generated. In the GAP_LINK_ESTABLISHED_EVENT case, I add the following code to start non-connectable advertising as shown below.

            // Advertising will stop after connection formed as slave
            if ((pPkt->connRole) == GAP_PROFILE_PERIPHERAL)
            {
                gapRole_AdvEnabled = FALSE;
                uint8_t AdvNonConnEnabled = TRUE;

                /* Turn ON Non-connectable advertising */
                GAPRole_SetParameter(GAPROLE_ADV_NONCONN_ENABLED, sizeof(uint8_t), &AdvNonConnEnabled, NULL);
            }

Once the App disconnects from the LP, I want to restart the connectable advertisement. And this doesn't seem to be working. I have added the below code in the GAP_LINK_TERMINATED_EVENT case to do this.

    // Connection terminated
    case GAP_LINK_TERMINATED_EVENT:
    {
        gapTerminateLinkEvent_t *pPkt = (gapTerminateLinkEvent_t *)pMsg;

        linkDBInfo_t pInfo;
        linkDB_GetInfo(pPkt->connectionHandle, &pInfo);

        // notify bond manager
        GAPBondMgr_LinkTerm(pPkt->connectionHandle);

        /* Turn back ON connectable advertising */
        uint8_t advertEnabled = TRUE;
        gapRole_AdvNonConnEnabled = FALSE;
        GAPRole_SetParameter(GAPROLE_ADVERT_ENABLED, sizeof(uint8_t), &advertEnabled, NULL);


        notify = TRUE;
    }

After the above, I expect the LP to start connectable advertising which is not happening, instead, it still remains in non-connectable advertising mode.

The main idea behind this is when the LP is in the connected state, It should still broadcast the ibeacon but not accept any connections. Once it disconnects, it should broadcast as well as accept connections.

I hope this makes sense.

That was the first thing I had tried as shown below:

    case GAP_LINK_TERMINATED_EVENT:
    {
        gapTerminateLinkEvent_t *pPkt = (gapTerminateLinkEvent_t *)pMsg;

        linkDBInfo_t pInfo;
        linkDB_GetInfo(pPkt->connectionHandle, &pInfo);

        // notify bond manager
        GAPBondMgr_LinkTerm(pPkt->connectionHandle);

        /* Turn OFF the Non-connectable advertising */
        uint8_t AdvNonConnEnabled = FALSE;
        GAPRole_SetParameter(GAPROLE_ADV_NONCONN_ENABLED, sizeof(uint8_t), &AdvNonConnEnabled, NULL);

        /* Turn ON the connectable advertising */
        uint8_t advertEnabled = TRUE;
        GAPRole_SetParameter(GAPROLE_ADVERT_ENABLED, sizeof(uint8_t), &advertEnabled, NULL);

        notify = TRUE;
    }
    break;

But it does not work i.e. After the disconnect, the LP remains in non-connectable advertising mode.

After some trying, the below method seems to work where I call GAP_EndDiscoverable(selfEntity) on gap terminate event. Then on an end discoverable event, I re-start the advertising in connectable mode from fresh. All shown below:

// Connection terminated
    case GAP_LINK_TERMINATED_EVENT:
    {
        gapTerminateLinkEvent_t *pPkt = (gapTerminateLinkEvent_t *)pMsg;

        linkDBInfo_t pInfo;
        linkDB_GetInfo(pPkt->connectionHandle, &pInfo);

        // notify bond manager
        GAPBondMgr_LinkTerm(pPkt->connectionHandle);

        /* End advertising to make a fresh start */
        GAP_EndDiscoverable(selfEntity);
        gapRole_AdvEnabled = FALSE;
        gapRole_AdvNonConnEnabled = FALSE;

        notify = TRUE;
    }

    // Advertising ended
    case GAP_END_DISCOVERABLE_DONE_EVENT:
    {
        /* Re-start the connectable advertising */
        uint8_t adv;
        uint8_t adv_status;
        GAPRole_GetParameter(GAPROLE_ADVERT_ENABLED, &adv_status, NULL);
        if (!adv_status)
        {
            adv = TRUE;
            GAPRole_SetParameter(GAPROLE_ADVERT_ENABLED, sizeof(uint8_t), &adv, NULL);
        }

    }
    break;

The above works, but I wonder why it works this way and why not the other/actual way? 

The GAPRole_createTask() has higher priority than the multi_role_createTask() task. So, the event first hits the GAP role task and then goes to the multi-role task. In your answer, you seem to just advise on implement callbacks from the GAP_LINK_TERMINATED_EVENT which doesn't help much.

Could you please shed some light on why this will solve the above problem?

and how to approach this solution?

and what do the events going back and forth between the application and the GAPRole (multi.c) has anything to do with the above not working?